com php-src: Fix SKIPIF conditions for online tests: ext/curl/tests/bug68937.phpt ext/curl/tests/bug68937 _2.phpt ext/curl/tests/bug71523.phpt ext/
curl/tests/bug72202.phpt ext/curl/tests/curl_mu lti_info_read.phpt ext/soap/tests/bugs/bug4481 1.phpt ext/sockets/tests/mcast_ipv4_recv.phpt e
xt/standard/tests/file/file_get_contents_error001 .phpt ext/standard/tests/network/gethostbyname_basic0 01.phpt

From: Date: Sun, 05 Aug 2018 21:28:28 +0000
Subject: com php-src: Fix SKIPIF conditions for online tests: ext/curl/tests/bug68937.phpt ext/curl/tests/bug68937 _2.phpt ext/curl/tests/bug71523.phpt ext/
curl/tests/bug72202.phpt ext/curl/tests/curl_mu lti_info_read.phpt ext/soap/tests/bugs/bug4481 1.phpt ext/sockets/tests/mcast_ipv4_recv.phpt e
xt/standard/tests/file/file_get_contents_error001 .phpt ext/standard/tests/network/gethostbyname_basic0 01.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-102829@lists.php.net to get a copy of this message
Commit: d570b7382d0a1c2c80ea7210daf8544eac08135d Author: Gabriel Caruso <carusogabriel34@gmail.com> Sun, 5 Aug 2018 18:24:08 -0300 Parents: d22dfa6e5f7ef3b472cb34ee991d60c639af614f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d570b7382d0a1c2c80ea7210daf8544eac08135d Log: Fix SKIPIF conditions for online tests Add when necessary, as well remove when not Changed paths: M ext/curl/tests/bug68937.phpt M ext/curl/tests/bug68937_2.phpt M ext/curl/tests/bug71523.phpt M ext/curl/tests/bug72202.phpt M ext/curl/tests/curl_multi_info_read.phpt M ext/soap/tests/bugs/bug44811.phpt M ext/sockets/tests/mcast_ipv4_recv.phpt M ext/standard/tests/file/file_get_contents_error001.phpt M ext/standard/tests/network/gethostbyname_basic001.phpt Diff: diff --git a/ext/curl/tests/bug68937.phpt b/ext/curl/tests/bug68937.phpt index ff8a906..013dd34 100644 --- a/ext/curl/tests/bug68937.phpt +++ b/ext/curl/tests/bug68937.phpt @@ -2,7 +2,6 @@ Bug # #68937 (Segfault in curl_multi_exec) --SKIPIF-- <?php -if (getenv("SKIP_ONLINE_TESTS")) die("skip online test"); include 'skipif.inc'; ?> --FILE-- diff --git a/ext/curl/tests/bug68937_2.phpt b/ext/curl/tests/bug68937_2.phpt index c25da3f..33af654 100644 --- a/ext/curl/tests/bug68937_2.phpt +++ b/ext/curl/tests/bug68937_2.phpt @@ -2,7 +2,6 @@ Bug # #68937 (Segfault in curl_multi_exec) --SKIPIF-- <?php -if (getenv("SKIP_ONLINE_TESTS")) die("skip online test"); include 'skipif.inc'; ?> --FILE-- diff --git a/ext/curl/tests/bug71523.phpt b/ext/curl/tests/bug71523.phpt index 84f1a17..c7889ea 100644 --- a/ext/curl/tests/bug71523.phpt +++ b/ext/curl/tests/bug71523.phpt @@ -5,9 +5,6 @@ Bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_ if (!extension_loaded("curl")) { exit("skip curl extension not loaded"); } -if (getenv("SKIP_ONLINE_TESTS")) { - die("skip online test"); -} ?> --FILE-- <?php diff --git a/ext/curl/tests/bug72202.phpt b/ext/curl/tests/bug72202.phpt index 63138d9..01564c0 100644 --- a/ext/curl/tests/bug72202.phpt +++ b/ext/curl/tests/bug72202.phpt @@ -5,9 +5,6 @@ Bug #72202 (curl_close doesn't close cURL handle) if (!extension_loaded("curl")) { exit("skip curl extension not loaded"); } -if (getenv("SKIP_ONLINE_TESTS")) { - die("skip online test"); -} ?> --FILE-- <?php diff --git a/ext/curl/tests/curl_multi_info_read.phpt b/ext/curl/tests/curl_multi_info_read.phpt index ef83822..8a2d489 100644 --- a/ext/curl/tests/curl_multi_info_read.phpt +++ b/ext/curl/tests/curl_multi_info_read.phpt @@ -4,7 +4,6 @@ array curl_multi_info_read ( resource $mh [, int &$msgs_in_queue = NULL ] ); marcosptf - <marcosptf@yahoo.com.br> - @phpsp - sao paulo - br --SKIPIF-- <?php -if (getenv("SKIP_ONLINE_TESTS")) { die('skip: online test'); } if (!extension_loaded('curl')) { print("skip"); } ?> --FILE-- diff --git a/ext/soap/tests/bugs/bug44811.phpt b/ext/soap/tests/bugs/bug44811.phpt index 1c7605f..8cfc4a7 100644 --- a/ext/soap/tests/bugs/bug44811.phpt +++ b/ext/soap/tests/bugs/bug44811.phpt @@ -2,7 +2,6 @@ Bug #44811 (Improve error messages when creating new SoapClient which contains invalid data) --SKIPIF-- <?php require_once 'skipif.inc'; ?> -<?php if (getenv("SKIP_ONLINE_TESTS")) die("skip online test"); ?> --INI-- soap.wsdl_cache_enabled=0 --FILE-- diff --git a/ext/sockets/tests/mcast_ipv4_recv.phpt b/ext/sockets/tests/mcast_ipv4_recv.phpt index fc92563..f56b21a 100644 --- a/ext/sockets/tests/mcast_ipv4_recv.phpt +++ b/ext/sockets/tests/mcast_ipv4_recv.phpt @@ -5,6 +5,7 @@ Multicast support: IPv4 receive options if (!extension_loaded('sockets')) { die('skip sockets extension not available.'); } +if (getenv('SKIP_ONLINE_TESTS')) die('skip online test'); $s = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP); $br = socket_bind($s, '0.0.0.0', 3000); $so = socket_set_option($s, IPPROTO_IP, MCAST_JOIN_GROUP, array( diff --git a/ext/standard/tests/file/file_get_contents_error001.phpt b/ext/standard/tests/file/file_get_contents_error001.phpt index 1437b8a..d86b37d 100644 --- a/ext/standard/tests/file/file_get_contents_error001.phpt +++ b/ext/standard/tests/file/file_get_contents_error001.phpt @@ -8,7 +8,6 @@ display_errors=false --SKIPIF-- <?php if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); - if (getenv("SKIP_ONLINE_TESTS")) die("skip online test"); ?> --FILE-- <?php diff --git a/ext/standard/tests/network/gethostbyname_basic001.phpt b/ext/standard/tests/network/gethostbyname_basic001.phpt index 9171e22..e917b59 100644 --- a/ext/standard/tests/network/gethostbyname_basic001.phpt +++ b/ext/standard/tests/network/gethostbyname_basic001.phpt @@ -5,7 +5,6 @@ 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

« previous php.cvs (#102829) next »