adding SKIP_SLOW_TESTS checks for the slow tests, and additionaly sync the domains...

diff --git a/ext/standard/tests/file/file_get_contents_error001.phpt b/ext/standard/tests/file/file_get_contents_error001.phpt
index ced0da032c8bb3009d8b77ce86a7e3e0890b8dec..127901ad797acb1567561e132770c876c25821af 100644 (file)
--- a/ext/standard/tests/file/file_get_contents_error001.phpt
+++ b/ext/standard/tests/file/file_get_contents_error001.phpt
@@ -7,6 +7,7 @@ file_get_contents() test using offset parameter out of range
 display_errors=false
 --SKIPIF--
 <?php
+       if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
        if (!function_exists("file_get_contents"))
                die ("skip file_get_contents function is not found");
 ?>

diff --git a/ext/standard/tests/file/lstat_stat_basic.phpt b/ext/standard/tests/file/lstat_stat_basic.phpt
index 362fcfe8694e85edd6d5ccd125fef5b6ca2dae24..0d1476d68d5451ce1db3755576e3e8b05c3d21e2 100644 (file)
--- a/ext/standard/tests/file/lstat_stat_basic.phpt
+++ b/ext/standard/tests/file/lstat_stat_basic.phpt
@@ -2,6 +2,7 @@
 Test lstat() & stat() functions: basic functionality
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. lstat() not available on Windows');
 }

diff --git a/ext/standard/tests/file/lstat_stat_variation10.phpt b/ext/standard/tests/file/lstat_stat_variation10.phpt
index a30b3c51f439fbac03087949b4356dc76291ab43..51ebc25e713a068b9a548e3dcb7c99ff8d80f11c 100644 (file)
--- a/ext/standard/tests/file/lstat_stat_variation10.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation10.phpt
@@ -2,6 +2,7 @@
 Test lstat() and stat() functions: usage variations - effects of is_dir()
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
 }

diff --git a/ext/standard/tests/file/lstat_stat_variation11.phpt b/ext/standard/tests/file/lstat_stat_variation11.phpt
index df1b8ac1281f187830a3744eef5e74fe54bed94a..a75504b4799bf2b88e28e14976ebd941e61eeae8 100644 (file)
--- a/ext/standard/tests/file/lstat_stat_variation11.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation11.phpt
@@ -2,6 +2,7 @@
 Test lstat() and stat() functions: usage variations - effect of is_file()
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
 }

diff --git a/ext/standard/tests/file/lstat_stat_variation12.phpt b/ext/standard/tests/file/lstat_stat_variation12.phpt
index c1e37b5435dc118b1a5f371c2ca0ca2db7903cb8..8e1edd66c730a9748322c91958ca1f05024f893b 100644 (file)
--- a/ext/standard/tests/file/lstat_stat_variation12.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation12.phpt
@@ -2,6 +2,7 @@
 Test lstat() and stat() functions: usage variations - effects of is_link()  
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
    die('skip.. lstat() not available on Windows');
 }

diff --git a/ext/standard/tests/file/lstat_stat_variation13.phpt b/ext/standard/tests/file/lstat_stat_variation13.phpt
index 474ddc516e103034a5865235cc09bd85fd3e55af..288e0b5ecfb1b46970606e4ae0c6ec466b53e677 100644 (file)
--- a/ext/standard/tests/file/lstat_stat_variation13.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation13.phpt
@@ -2,6 +2,7 @@
 Test lstat() and stat() functions: usage variations - file opened using w and r mode 
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
 }

diff --git a/ext/standard/tests/file/lstat_stat_variation15.phpt b/ext/standard/tests/file/lstat_stat_variation15.phpt
index 45912ae58952d9970a0bf18d77c572d434d7d2d7..8b67338abb9243a0730409375d6ab17f18356c67 100644 (file)
--- a/ext/standard/tests/file/lstat_stat_variation15.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation15.phpt
@@ -2,6 +2,7 @@
 Test lstat() and stat() functions: usage variations - effects changing permissions of link
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. lstat() not available on Windows');
 }

diff --git a/ext/standard/tests/file/lstat_stat_variation16.phpt b/ext/standard/tests/file/lstat_stat_variation16.phpt
index 641ccd58dfd087aefe8361fcf4eb8396635990a2..9f1276548f8da33961c001d6fc2d6295594a2128 100644 (file)
--- a/ext/standard/tests/file/lstat_stat_variation16.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation16.phpt
@@ -2,6 +2,7 @@
 Test lstat() and stat() functions: usage variations - effects changing permissions of file
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
 }

diff --git a/ext/standard/tests/file/lstat_stat_variation17.phpt b/ext/standard/tests/file/lstat_stat_variation17.phpt
index e50abf3f899b69d8d0680159c2db813679436ef4..f2306de7922403d7aa6b3b9540f9b915add79105 100644 (file)
--- a/ext/standard/tests/file/lstat_stat_variation17.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation17.phpt
@@ -2,6 +2,7 @@
 Test lstat() and stat() functions: usage variations - effects changing permissions of dir
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
 }

diff --git a/ext/standard/tests/file/lstat_stat_variation21.phpt b/ext/standard/tests/file/lstat_stat_variation21.phpt
index 1009c92c5a36b88939e7803c1ceac177be2b6758..8620ab00d7bc24998608c64d782eade7fe9aad4d 100644 (file)
--- a/ext/standard/tests/file/lstat_stat_variation21.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation21.phpt
@@ -2,6 +2,7 @@
 Test lstat() and stat() functions: usage variations - effects of truncate()
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
 }

diff --git a/ext/standard/tests/file/lstat_stat_variation4.phpt b/ext/standard/tests/file/lstat_stat_variation4.phpt
index 7407a63bf351f09ec1922d4ec636a348cb649097..259beca006160854bf6913059475dbabcc3d44ee 100755 (executable)
--- a/ext/standard/tests/file/lstat_stat_variation4.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation4.phpt
@@ -2,6 +2,7 @@
 Test lstat() and stat() functions: usage variations - effects of touch() on file
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
 }

diff --git a/ext/standard/tests/file/lstat_stat_variation5.phpt b/ext/standard/tests/file/lstat_stat_variation5.phpt
index 895e606b9a25d799064ca0e45042a8ed9105e16b..d0c096ef19cd0b63e5e9b1225aee6a34bc8999ba 100755 (executable)
--- a/ext/standard/tests/file/lstat_stat_variation5.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation5.phpt
@@ -2,6 +2,7 @@
 Test lstat() and stat() functions: usage variations - effects of touch() on dir
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
 }

diff --git a/ext/standard/tests/file/lstat_stat_variation6.phpt b/ext/standard/tests/file/lstat_stat_variation6.phpt
index 8704c6d7c607c4ade3509106829de2dc24fb09cd..7e557d034a2117063d665de04a157f12bed6bd24 100755 (executable)
--- a/ext/standard/tests/file/lstat_stat_variation6.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation6.phpt
@@ -2,6 +2,7 @@
 Test lstat() and stat() functions: usage variations - effects of touch() on link 
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (!(stristr(PHP_OS, 'linux')))  {
     die('skip.. test valid for linux only');
 }

diff --git a/ext/standard/tests/file/lstat_stat_variation8.phpt b/ext/standard/tests/file/lstat_stat_variation8.phpt
index 412c3bf038bbe7005b9f1fc4a586b45a8e8a3f78..b0f170d1f20d2ec4f416bbf4291a17e4b68ee31b 100644 (file)
--- a/ext/standard/tests/file/lstat_stat_variation8.phpt
+++ b/ext/standard/tests/file/lstat_stat_variation8.phpt
@@ -2,6 +2,7 @@
 Test lstat() and stat() functions: usage variations - creating file/subdir
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. Not valid for Windows');
 }

diff --git a/ext/standard/tests/file/touch_basic.phpt b/ext/standard/tests/file/touch_basic.phpt
index fb042df674ae5920f81323dc27901214c0f73e22..c41fdf1d7b0ddee0c14afd9a1c33437f1178094d 100644 (file)
--- a/ext/standard/tests/file/touch_basic.phpt
+++ b/ext/standard/tests/file/touch_basic.phpt
@@ -4,6 +4,7 @@ Test touch() function : basic functionality
 Dave Kelsey <d_kelsey@uk.ibm.com>
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip.. only for Non Windows');
 }

diff --git a/ext/standard/tests/general_functions/bug39322.phpt b/ext/standard/tests/general_functions/bug39322.phpt
index 6ba740dc8137cf213eca3470038ce27aaa524f6c..ef74e483978660373276bd06459558c39ac9d2ea 100644 (file)
--- a/ext/standard/tests/general_functions/bug39322.phpt
+++ b/ext/standard/tests/general_functions/bug39322.phpt
@@ -2,6 +2,7 @@
 Bug #39322 (proc_terminate() loosing process resource)
 --SKIPIF--
 <?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
 if (!is_executable('/bin/sleep')) echo 'skip sleep not found';
 ?>
 --FILE--

diff --git a/ext/standard/tests/general_functions/sleep_basic.phpt b/ext/standard/tests/general_functions/sleep_basic.phpt
index cfc00c6eabaf097b741b1658f51571aad0bf5980..5d7fe536f1df547ddd34dd5d077d790b6ad98563 100644 (file)
--- a/ext/standard/tests/general_functions/sleep_basic.phpt
+++ b/ext/standard/tests/general_functions/sleep_basic.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Test sleep() function : basic functionality 
+--SKIPIF--
+<?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+?>
 --FILE--
 <?php
 /* Prototype  : int sleep  ( int $seconds  )

diff --git a/ext/standard/tests/general_functions/usleep_basic.phpt b/ext/standard/tests/general_functions/usleep_basic.phpt
index 22c3e658b123dd2c5210fe8a34e8f30717bdb29b..d6f312e15b554ffbece91dd6973bfaa0ae3a2b1f 100644 (file)
--- a/ext/standard/tests/general_functions/usleep_basic.phpt
+++ b/ext/standard/tests/general_functions/usleep_basic.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Test usleep() function
+--SKIPIF--
+<?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+?>
 --FILE--
 <?php
 /* Prototype  : void usleep  ( int $micro_seconds  )

diff --git a/ext/standard/tests/misc/time_sleep_until_basic.phpt b/ext/standard/tests/misc/time_sleep_until_basic.phpt
index b9b359fab1592b8cfe0832ad1c1c8e0e639200d6..9ae912881aba7061bf60731eb14e9300fbcb52c2 100644 (file)
--- a/ext/standard/tests/misc/time_sleep_until_basic.phpt
+++ b/ext/standard/tests/misc/time_sleep_until_basic.phpt
@@ -1,7 +1,10 @@
 --TEST--
 time_sleep_until() function - basic test for time_sleep_until()
 --SKIPIF--
-<?php  if (!function_exists("time_sleep_until")) die('skip time_sleep_until() not available');?>
+<?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+if (!function_exists("time_sleep_until")) die('skip time_sleep_until() not available');
+?>
 --CREDITS--
 Manuel Baldassarri mb@ideato.it
 Michele Orselli mo@ideato.it

diff --git a/ext/standard/tests/network/gethostbyname_basic001.phpt b/ext/standard/tests/network/gethostbyname_basic001.phpt
index 0cfc1b4f5326b385574c1f53f65749a5e2d9995e..e917b599207d30524959573d9cd54aeb4c48e564 100644 (file)
--- a/ext/standard/tests/network/gethostbyname_basic001.phpt
+++ b/ext/standard/tests/network/gethostbyname_basic001.phpt
@@ -2,6 +2,10 @@
 gethostbyname() function - basic type return test
 --CREDITS--
 "Sylvain R." <sracine@phpquebec.org>
+--SKIPIF--
+<?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+?>
 --FILE--
 <?php
        var_dump(is_string(gethostbyname("www.php.net")));

diff --git a/ext/standard/tests/network/gethostbyname_basic002.phpt b/ext/standard/tests/network/gethostbyname_basic002.phpt
index b4e191bfc4f71ba2f1c70b3209c102325621515d..983faa929e004495829ecae014dcbaa89c3c26cb 100644 (file)
--- a/ext/standard/tests/network/gethostbyname_basic002.phpt
+++ b/ext/standard/tests/network/gethostbyname_basic002.phpt
@@ -2,6 +2,10 @@
 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");

diff --git a/ext/standard/tests/network/gethostbyname_error004.phpt b/ext/standard/tests/network/gethostbyname_error004.phpt
index 1d0f7d7a1cfa31449102bc900539d46165cf803e..7aac1729207121cfb15e6f3bc41326f278a71dac 100644 (file)
--- a/ext/standard/tests/network/gethostbyname_error004.phpt
+++ b/ext/standard/tests/network/gethostbyname_error004.phpt
@@ -2,6 +2,10 @@
 gethostbyname() function - basic return valid ip address 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");

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

diff --git a/ext/standard/tests/network/http-stream.phpt b/ext/standard/tests/network/http-stream.phpt
index e70caf98232550aabdfec53a066702a83ac4d927..6ee035a241d20618f08cbd9f57813e0ef52aabb5 100644 (file)
--- a/ext/standard/tests/network/http-stream.phpt
+++ b/ext/standard/tests/network/http-stream.phpt
@@ -1,7 +1,10 @@
 --TEST--
 http-stream test
 --SKIPIF--
-<?php if (!extension_loaded("dom")) die("skip dom extension is not present"); ?>
+<?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+if (!extension_loaded("dom")) die("skip dom extension is not present");
+?>
 --INI--
 allow_url_fopen=1
 --FILE--

diff --git a/tests/lang/045.phpt b/tests/lang/045.phpt
index 399fac7f60103de14acb19b630d54ca296ea31d4..11598cf035c086272cb36aeb36e3fa11a53142a4 100644 (file)
--- a/tests/lang/045.phpt
+++ b/tests/lang/045.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Timeout again inside register_shutdown_function
+--SKIPIF--
+<?php
+if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+?>
 --FILE--
 <?php
 set_time_limit(1);