From: Gabriel Caruso <carusogabriel34@gmail.com>
Date: Sun, 5 Aug 2018 21:24:08 +0000 (-0300)
Subject: Fix SKIPIF conditions for online tests
X-Git-Tag: php-7.4.0alpha1~2143
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d570b7382d0a1c2c80ea7210daf8544eac08135d;p=php

Fix SKIPIF conditions for online tests

Add when necessary, as well remove when not
---

diff --git a/ext/curl/tests/bug68937.phpt b/ext/curl/tests/bug68937.phpt
index ff8a906eba..013dd340d5 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 c25da3fd71..33af654ec3 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 84f1a17159..c7889eaca0 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 63138d9ba6..01564c0a58 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 ef83822b4a..8a2d48918e 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 1c7605f610..8cfc4a76cd 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 fc92563e84..f56b21a2fa 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 1437b8a8a0..d86b37d513 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 9171e226aa..e917b59920 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