From 90d587bbe3443f33beefaaba2bf2036a00aff865 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 24 Sep 2012 09:13:40 +0200
Subject: [PATCH 1/4] gethostbyname_basic002.phpt is a duplicate to
 gethostbyname_error004.phpt

---
 .../tests/network/gethostbyname_basic002.phpt     | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 ext/standard/tests/network/gethostbyname_basic002.phpt

diff --git a/ext/standard/tests/network/gethostbyname_basic002.phpt b/ext/standard/tests/network/gethostbyname_basic002.phpt
deleted file mode 100644
index 983faa929e004..0000000000000
--- a/ext/standard/tests/network/gethostbyname_basic002.phpt
+++ /dev/null
@@ -1,15 +0,0 @@
---TEST--
-gethostbyname() function - basic invalid parameter test
---CREDITS--
-"Sylvain R." <sracine@phpquebec.org>
---SKIPIF--
-<?php
-if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-?>
---FILE--
-<?php
-	$ip = gethostbyname("www.php.net");
-	var_dump((bool) ip2long($ip));
-?>
---EXPECT--
-bool(true)

From f0b604eab90d7742b95ddb577475bf76c981942e Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 24 Sep 2012 09:15:03 +0200
Subject: [PATCH 2/4] Bug #63147: introduce SKIP_ONLINE_TESTS, for
 gethostbyname

---
 ext/standard/tests/network/gethostbyname_basic001.phpt | 1 +
 ext/standard/tests/network/gethostbyname_error004.phpt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ext/standard/tests/network/gethostbyname_basic001.phpt b/ext/standard/tests/network/gethostbyname_basic001.phpt
index e917b599207d3..9171e226aa309 100644
--- a/ext/standard/tests/network/gethostbyname_basic001.phpt
+++ b/ext/standard/tests/network/gethostbyname_basic001.phpt
@@ -5,6 +5,7 @@ gethostbyname() function - basic type return test
 --SKIPIF--
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+if (getenv("SKIP_ONLINE_TESTS")) die("skip test requiring internet connection");
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/network/gethostbyname_error004.phpt b/ext/standard/tests/network/gethostbyname_error004.phpt
index 7aac172920712..274301a2368b5 100644
--- a/ext/standard/tests/network/gethostbyname_error004.phpt
+++ b/ext/standard/tests/network/gethostbyname_error004.phpt
@@ -5,6 +5,7 @@ gethostbyname() function - basic return valid ip address test
 --SKIPIF--
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+if (getenv("SKIP_ONLINE_TESTS")) die("skip test requiring internet connection");
 ?>
 --FILE--
 <?php

From 3fd7d9cec7ec3e94998e0c44bf2e37025df77b65 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Mon, 24 Sep 2012 09:16:11 +0200
Subject: [PATCH 3/4] Bug #63147: SKIP_ONLINE_TESTS, for getmxrr

---
 ext/standard/tests/network/getmxrr.phpt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/standard/tests/network/getmxrr.phpt b/ext/standard/tests/network/getmxrr.phpt
index 29cea1d71ef97..c4a15c52ce4fb 100644
--- a/ext/standard/tests/network/getmxrr.phpt
+++ b/ext/standard/tests/network/getmxrr.phpt
@@ -3,6 +3,7 @@ getmxrr() test
 --SKIPIF--
 <?php
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+if (getenv("SKIP_ONLINE_TESTS")) die("skip test requiring internet connection");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip: no Windows support');
 }

From 9cd98228c11efa98556cb06aac42e6d47cc02443 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 25 Sep 2012 06:52:08 +0200
Subject: [PATCH 4/4] add --offline option to run-tests command

---
 run-tests.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/run-tests.php b/run-tests.php
index cfc562ebc15de..a746c369653cc 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -632,6 +632,9 @@ function save_or_mail_results()
 				case 'x':
 					$environment['SKIP_SLOW_TESTS'] = 1;
 					break;
+				case '--offline':
+					$environment['SKIP_ONLINE_TESTS'] = 1;
+					break;
 				//case 'w'
 				case '-':
 					// repeat check with full switch
@@ -689,6 +692,8 @@ function save_or_mail_results()
 
     -x          Sets 'SKIP_SLOW_TESTS' environmental variable.
 
+    --offline   Sets 'SKIP_ONLINE_TESTS' environmental variable.
+
     --verbose
     -v          Verbose mode.