From: Ville Hukkamäki <vhu@iki.fi>
Date: Thu, 11 Aug 2016 09:08:04 +0000 (+0300)
Subject: Fix #72810. Add check for SKIP_ONLINE_TESTS
X-Git-Tag: php-7.1.0beta3~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=283b0cc8a5eeb69b8d77195549b385d1db4f6955;p=php

Fix #72810. Add check for SKIP_ONLINE_TESTS
---

diff --git a/NEWS b/NEWS
index 3cd83b927a..c4f3cdbb01 100644
--- a/NEWS
+++ b/NEWS
@@ -44,6 +44,7 @@ PHP                                                                        NEWS
     (vhuk)
   . Fixed bug #72764 (ftps:// opendir wrapper data channel encryption fails
     with IIS FTP 7.5, 8.5). (vhuk)
+  . Fixed bug #72810 (Missing SKIP_ONLINE_TESTS checks). (vhuk)
 
 04 Aug 2016, PHP 7.1.0beta2
 
diff --git a/ext/sockets/tests/socket_send.phpt b/ext/sockets/tests/socket_send.phpt
index ceeb397979..4093ad47cf 100644
--- a/ext/sockets/tests/socket_send.phpt
+++ b/ext/sockets/tests/socket_send.phpt
@@ -4,6 +4,7 @@ int socket_send ( resource $socket , string $buf , int $len , int $flags );
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --SKIPIF--
 <?php
+if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
 if (!extension_loaded('sockets')) {
   die('SKIP sockets extension not available.');
 }
diff --git a/ext/sockets/tests/socket_shutdown.phpt b/ext/sockets/tests/socket_shutdown.phpt
index 77cbc8f32c..747016b795 100644
--- a/ext/sockets/tests/socket_shutdown.phpt
+++ b/ext/sockets/tests/socket_shutdown.phpt
@@ -4,6 +4,7 @@ bool socket_shutdown ( resource $socket [, int $how = 2 ] ) ;
 marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
 --SKIPIF--
 <?php
+if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
 if (!extension_loaded('sockets')) {
   die('SKIP sockets extension not available.');
 }
diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt
index ca3289fbc2..401c65bce0 100644
--- a/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt
+++ b/ext/standard/tests/streams/stream_context_tcp_nodelay.phpt
@@ -1,7 +1,10 @@
 --TEST--
 stream context tcp_nodelay
 --SKIPIF--
-<?php if (!extension_loaded("sockets")) die("skip: need sockets") ?>
+<?php
+if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
+if (!extension_loaded("sockets")) die("skip: need sockets");
+ ?>
 --FILE--
 <?php
 $ctxt = stream_context_create([
diff --git a/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt b/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt
index 08ad4c2d2e..bf35925e4d 100644
--- a/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt
+++ b/ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt
@@ -1,7 +1,10 @@
 --TEST--
 stream context tcp_nodelay fopen
 --SKIPIF--
-<?php if (!extension_loaded("sockets")) die("skip: need sockets") ?>
+<?php
+if (getenv("SKIP_ONLINE_TESTS")) die("skip online test");
+if (!extension_loaded("sockets")) die("skip: need sockets");
+?>
 --FILE--
 <?php
 $ctxt = stream_context_create([