com php-src: Fix #72810. Add check for SKIP_ONLINE_TESTS: NEWS ext/sockets/tests/socket_send.phpt ext/sockets/ tests/socket_shutdown.phpt
ext/standard/tests/streams/str eam_context_tcp_nodelay.phpt ext/standard/tests/strea ms/stream_context_tcp_nodelay_fopen.phpt
| From: | Nikita Popov | Date: | Thu, 11 Aug 2016 10:01:24 +0000 |
| Subject: | com php-src: Fix #72810. Add check for SKIP_ONLINE_TESTS: NEWS ext/sockets/tests/socket_send.phpt ext/sockets/ tests/socket_shutdown.phpt ext/standard/tests/streams/str eam_context_tcp_nodelay.phpt ext/standard/tests/strea ms/stream_context_tcp_nodelay_fopen.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93740@lists.php.net to get a copy of this message | ||
Commit: 283b0cc8a5eeb69b8d77195549b385d1db4f6955
Author: Ville Hukkamäki <vhu@iki.fi> Thu, 11 Aug 2016 12:08:04 +0300
Committer: Nikita Popov <nikic@php.net> Thu, 11 Aug 2016 12:01:24 +0200
Parents: a53a6b3fb4060c9c71a84b0acaaa0211777f6e17
Branches: PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=283b0cc8a5eeb69b8d77195549b385d1db4f6955
Log:
Fix #72810. Add check for SKIP_ONLINE_TESTS
Bugs:
https://bugs.php.net/72810
Changed paths:
M NEWS
M ext/sockets/tests/socket_send.phpt
M ext/sockets/tests/socket_shutdown.phpt
M ext/standard/tests/streams/stream_context_tcp_nodelay.phpt
M ext/standard/tests/streams/stream_context_tcp_nodelay_fopen.phpt
Diff:
diff --git a/NEWS b/NEWS
index 3cd83b9...c4f3cdb 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 ceeb397..4093ad4 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 77cbc8f..747016b 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 ca3289f..401c65b 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 08ad4c2..bf35925 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([