Merge branch 'PHP-5.4'

smalyshev · smalyshev · commit 4ba2d546c875 · 2012-09-30T19:41:54.000-07:00
* PHP-5.4:
  add news for --offline
  add --offline option to run-tests command
  Bug #63147: SKIP_ONLINE_TESTS, for getmxrr
  Bug #63147: introduce SKIP_ONLINE_TESTS, for gethostbyname
  gethostbyname_basic002.phpt is a duplicate to gethostbyname_error004.phpt
diff --git 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_basic002.phpt b/ext/standard/tests/network/gethostbyname_basic002.phpt
diff --git 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
diff --git 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');
 }
diff --git a/run-tests.php b/run-tests.php
@@ -635,6 +635,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
@@ -692,6 +695,8 @@ function save_or_mail_results()
 
     -x          Sets 'SKIP_SLOW_TESTS' environmental variable.
 
+    --offline   Sets 'SKIP_ONLINE_TESTS' environmental variable.
+
     --verbose
     -v          Verbose mode.
 

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ getmxrr() test`
`3`	`3`	`--SKIPIF--`
`4`	`4`	`<?php`
`5`	`5`	`if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");`
	`6`	`+if (getenv("SKIP_ONLINE_TESTS")) die("skip test requiring internet connection");`
`6`	`7`	`if (substr(PHP_OS, 0, 3) == 'WIN') {`
`7`	`8`	`die('skip: no Windows support');`
`8`	`9`	`}`