Skip to content

Commit 4ba2d54

Browse files
committed
Merge branch 'PHP-5.4'
* 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
2 parents 815248d + d3c37f0 commit 4ba2d54

File tree

5 files changed

+8
-15
lines changed

5 files changed

+8
-15
lines changed

ext/standard/tests/network/gethostbyname_basic001.phpt

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ gethostbyname() function - basic type return test
55
--SKIPIF--
66
<?php
77
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
8+
if (getenv("SKIP_ONLINE_TESTS")) die("skip test requiring internet connection");
89
?>
910
--FILE--
1011
<?php

ext/standard/tests/network/gethostbyname_basic002.phpt

-15
This file was deleted.

ext/standard/tests/network/gethostbyname_error004.phpt

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ gethostbyname() function - basic return valid ip address test
55
--SKIPIF--
66
<?php
77
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
8+
if (getenv("SKIP_ONLINE_TESTS")) die("skip test requiring internet connection");
89
?>
910
--FILE--
1011
<?php

ext/standard/tests/network/getmxrr.phpt

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ getmxrr() test
33
--SKIPIF--
44
<?php
55
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
6+
if (getenv("SKIP_ONLINE_TESTS")) die("skip test requiring internet connection");
67
if (substr(PHP_OS, 0, 3) == 'WIN') {
78
die('skip: no Windows support');
89
}

run-tests.php

+5
Original file line numberDiff line numberDiff line change
@@ -635,6 +635,9 @@ function save_or_mail_results()
635635
case 'x':
636636
$environment['SKIP_SLOW_TESTS'] = 1;
637637
break;
638+
case '--offline':
639+
$environment['SKIP_ONLINE_TESTS'] = 1;
640+
break;
638641
//case 'w'
639642
case '-':
640643
// repeat check with full switch
@@ -692,6 +695,8 @@ function save_or_mail_results()
692695
693696
-x Sets 'SKIP_SLOW_TESTS' environmental variable.
694697
698+
--offline Sets 'SKIP_ONLINE_TESTS' environmental variable.
699+
695700
--verbose
696701
-v Verbose mode.
697702

0 commit comments

Comments
 (0)