From 2f7003847d3b48ea89fdec2bd5388085cf6b4d0e Mon Sep 17 00:00:00 2001 From: Gabriel Caruso Date: Thu, 26 Jul 2018 21:12:21 -0300 Subject: [PATCH] Make more tests run on Linux --- ext/curl/tests/bug48203-win32.phpt | 37 ---------------- ext/curl/tests/bug48203.phpt | 10 ++--- ...bug54798-win32.phpt => bug54798-unix.phpt} | 17 +++----- ext/curl/tests/bug54798.phpt | 16 +++---- ext/curl/tests/bug61948-unix.phpt | 23 ++++++++++ ext/curl/tests/bug61948-win32.phpt | 32 -------------- ext/curl/tests/bug61948.phpt | 25 +++++++---- .../date_default_timezone_get-1-win32.phpt | 21 --------- ext/date/tests/gmstrftime_variation11.phpt | 8 +--- ext/date/tests/gmstrftime_variation13.phpt | 8 +--- ext/date/tests/gmstrftime_variation15.phpt | 8 +--- ext/date/tests/gmstrftime_variation17.phpt | 6 --- ext/date/tests/gmstrftime_variation19.phpt | 6 --- ext/date/tests/gmstrftime_variation21.phpt | 8 +--- ext/date/tests/gmstrftime_variation9.phpt | 6 --- ext/date/tests/strftime_variation11.phpt | 6 --- ext/date/tests/strftime_variation13.phpt | 6 --- ext/date/tests/strftime_variation15.phpt | 6 --- ext/date/tests/strftime_variation17.phpt | 6 --- ext/date/tests/strftime_variation19.phpt | 6 --- ext/date/tests/strftime_variation21.phpt | 6 --- ext/date/tests/strftime_variation9.phpt | 6 --- ext/pcre/tests/bug72463_2.phpt | 6 --- ext/sockets/tests/bug63000.phpt | 3 -- ext/sockets/tests/socket_send.phpt | 3 -- ext/sockets/tests/socket_send_win32.phpt | 43 ------------------- ...=> socket_sendrecvmsg_multi_msg-unix.phpt} | 29 +++++++------ .../tests/socket_sendrecvmsg_multi_msg.phpt | 27 +++++------- ext/standard/tests/file/bug43353-win32.phpt | 25 ----------- ext/standard/tests/file/bug43353.phpt | 5 --- ext/standard/tests/file/bug44805.phpt | 6 --- ext/standard/tests/file/bug60120.phpt | 3 -- ext/standard/tests/file/bug65272.phpt | 4 -- ...open-win32-mb0.phpt => proc_open-mb0.phpt} | 1 - ...open-win32-mb1.phpt => proc_open-mb1.phpt} | 1 - ext/standard/tests/mail/bug69115.phpt | 6 --- ...log_basic-win32.phpt => syslog_basic.phpt} | 7 +-- .../{bug61371-win.phpt => bug61371-unix.phpt} | 6 +-- ext/standard/tests/streams/bug61371.phpt | 7 +-- ...75574_utf8_win.phpt => bug75574_utf8.phpt} | 6 +-- .../tests/{002-win32.phpt => 002-unix.phpt} | 6 +-- sapi/cli/tests/002.phpt | 9 ++-- sapi/cli/tests/argv_mb.phpt | 7 +-- tests/security/open_basedir_mkdir.phpt | 6 --- 44 files changed, 103 insertions(+), 386 deletions(-) delete mode 100644 ext/curl/tests/bug48203-win32.phpt rename ext/curl/tests/{bug54798-win32.phpt => bug54798-unix.phpt} (86%) create mode 100644 ext/curl/tests/bug61948-unix.phpt delete mode 100644 ext/curl/tests/bug61948-win32.phpt delete mode 100644 ext/date/tests/date_default_timezone_get-1-win32.phpt delete mode 100644 ext/sockets/tests/socket_send_win32.phpt rename ext/sockets/tests/{socket_sendrecvmsg_multi_msg-win32.phpt => socket_sendrecvmsg_multi_msg-unix.phpt} (81%) delete mode 100644 ext/standard/tests/file/bug43353-win32.phpt rename ext/standard/tests/general_functions/{proc_open-win32-mb0.phpt => proc_open-mb0.phpt} (93%) rename ext/standard/tests/general_functions/{proc_open-win32-mb1.phpt => proc_open-mb1.phpt} (92%) rename ext/standard/tests/network/{syslog_basic-win32.phpt => syslog_basic.phpt} (80%) rename ext/standard/tests/streams/{bug61371-win.phpt => bug61371-unix.phpt} (80%) rename sapi/cgi/tests/{bug75574_utf8_win.phpt => bug75574_utf8.phpt} (86%) rename sapi/cli/tests/{002-win32.phpt => 002-unix.phpt} (63%) diff --git a/ext/curl/tests/bug48203-win32.phpt b/ext/curl/tests/bug48203-win32.phpt deleted file mode 100644 index d3affdb71d..0000000000 --- a/ext/curl/tests/bug48203-win32.phpt +++ /dev/null @@ -1,37 +0,0 @@ ---TEST-- -Bug #48203 (Crash when CURLOPT_STDERR is set to regular file) ---SKIPIF-- - - ---FILE-- - ---CLEAN-- - ---EXPECTF-- -Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %s on line %d -%A -Hello World! -Hello World!* Closing connection 0 -Ok - diff --git a/ext/curl/tests/bug48203.phpt b/ext/curl/tests/bug48203.phpt index fc8b4091fc..11855235c5 100644 --- a/ext/curl/tests/bug48203.phpt +++ b/ext/curl/tests/bug48203.phpt @@ -2,11 +2,6 @@ Bug #48203 (Crash when CURLOPT_STDERR is set to regular file) --SKIPIF-- - --FILE-- --EXPECTF-- -Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %sbug48203.php on line %d +Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %s on line %d %A +Hello World! +Hello World!* Closing connection 0 Ok + diff --git a/ext/curl/tests/bug54798-win32.phpt b/ext/curl/tests/bug54798-unix.phpt similarity index 86% rename from ext/curl/tests/bug54798-win32.phpt rename to ext/curl/tests/bug54798-unix.phpt index bce39903ba..d2542815d4 100644 --- a/ext/curl/tests/bug54798-win32.phpt +++ b/ext/curl/tests/bug54798-unix.phpt @@ -3,8 +3,8 @@ Bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed before calling c --SKIPIF-- --FILE-- @@ -56,12 +56,9 @@ foreach($options_to_check as $option) { --CLEAN-- --EXPECTF-- -%AOk for CURLOPT_STDERR - -%AOk for CURLOPT_WRITEHEADER - -%AHello World! -Hello World!Ok for CURLOPT_FILE - -%AOk for CURLOPT_INFILE +%a +%aOk for CURLOPT_STDERR +%aOk for CURLOPT_WRITEHEADER +%aOk for CURLOPT_FILE +%aOk for CURLOPT_INFILE ===DONE=== diff --git a/ext/curl/tests/bug54798.phpt b/ext/curl/tests/bug54798.phpt index d2542815d4..eab75e6fd4 100644 --- a/ext/curl/tests/bug54798.phpt +++ b/ext/curl/tests/bug54798.phpt @@ -3,9 +3,6 @@ Bug #54798 (Segfault when CURLOPT_STDERR file pointer is closed before calling c --SKIPIF-- --FILE-- --EXPECTF-- -%a -%aOk for CURLOPT_STDERR -%aOk for CURLOPT_WRITEHEADER -%aOk for CURLOPT_FILE -%aOk for CURLOPT_INFILE +%AOk for CURLOPT_STDERR + +%AOk for CURLOPT_WRITEHEADER + +%AHello World! +Hello World!Ok for CURLOPT_FILE + +%AOk for CURLOPT_INFILE ===DONE=== diff --git a/ext/curl/tests/bug61948-unix.phpt b/ext/curl/tests/bug61948-unix.phpt new file mode 100644 index 0000000000..cb84a466e7 --- /dev/null +++ b/ext/curl/tests/bug61948-unix.phpt @@ -0,0 +1,23 @@ +--TEST-- +Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) +--SKIPIF-- + +--INI-- +open_basedir="/tmp" +--FILE-- + +--EXPECTF-- +bool(true) +bool(true) + +Warning: curl_setopt(): open_basedir restriction in effect. File(/xxx/bar) is not within the allowed path(s): (/tmp) in %sbug61948-unix.php on line %d +bool(false) diff --git a/ext/curl/tests/bug61948-win32.phpt b/ext/curl/tests/bug61948-win32.phpt deleted file mode 100644 index b91ccb7815..0000000000 --- a/ext/curl/tests/bug61948-win32.phpt +++ /dev/null @@ -1,32 +0,0 @@ ---TEST-- -Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) ---SKIPIF-- - ---FILE-- - ---CLEAN-- - ---EXPECTF-- -%a -bool(true) - -Warning: curl_setopt(): open_basedir restriction in effect. File(c:/xxx/bar) is not within the allowed path(s): (%sbug61948) in %sbug61948-win32.php on line %d -bool(false) diff --git a/ext/curl/tests/bug61948.phpt b/ext/curl/tests/bug61948.phpt index 00df07d73e..b8fda6d83c 100644 --- a/ext/curl/tests/bug61948.phpt +++ b/ext/curl/tests/bug61948.phpt @@ -1,23 +1,30 @@ --TEST-- Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction) --SKIPIF-- - ---INI-- -open_basedir="/tmp" --FILE-- +--CLEAN-- + --EXPECTF-- -bool(true) +%a bool(true) -Warning: curl_setopt(): open_basedir restriction in effect. File(/xxx/bar) is not within the allowed path(s): (/tmp) in %sbug61948.php on line %d +Warning: curl_setopt(): open_basedir restriction in effect. File(c:/xxx/bar) is not within the allowed path(s): (%sbug61948) in %sbug61948.php on line %d bool(false) diff --git a/ext/date/tests/date_default_timezone_get-1-win32.phpt b/ext/date/tests/date_default_timezone_get-1-win32.phpt deleted file mode 100644 index 73003fb689..0000000000 --- a/ext/date/tests/date_default_timezone_get-1-win32.phpt +++ /dev/null @@ -1,21 +0,0 @@ ---TEST-- -date_default_timezone_get() function [1] ---SKIPIF-- - ---INI-- -date.timezone= ---FILE-- - ---EXPECT-- -UTC -UTC diff --git a/ext/date/tests/gmstrftime_variation11.phpt b/ext/date/tests/gmstrftime_variation11.phpt index f90e51ec16..d760a6d951 100644 --- a/ext/date/tests/gmstrftime_variation11.phpt +++ b/ext/date/tests/gmstrftime_variation11.phpt @@ -1,11 +1,5 @@ --TEST-- -Test gmstrftime() function : usage variation - Checking month related formats which was not supported on Windows before VC14. ---SKIPIF-- - +Test gmstrftime() function : usage variation - Checking month related formats which was not supported on Windows before VC14. --FILE-- +Test gmstrftime() function : usage variation - Checking date related formats which was not supported on Windows before VC14. --FILE-- +Test gmstrftime() function : usage variation - Checking time related formats which was not supported on Windows before VC14. --FILE-- --FILE-- --FILE-- +Test gmstrftime() function : usage variation - Checking Preferred date and time representation on Windows. --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --INI-- SMTP=non.existent.smtp.server --FILE-- diff --git a/ext/sockets/tests/bug63000.phpt b/ext/sockets/tests/bug63000.phpt index a467d143c6..024f784ccb 100644 --- a/ext/sockets/tests/bug63000.phpt +++ b/ext/sockets/tests/bug63000.phpt @@ -5,9 +5,6 @@ Bug #63000: Multicast on OSX if (!extension_loaded('sockets')) { die('skip sockets extension not available.'); } -if (PHP_OS !== 'Darwin') { - die('skip Is not OSX.'); -} --FILE-- --FILE-- - #phparty7 - @phpsp - novatec/2015 - sao paulo - br ---SKIPIF-- - ---FILE-- - - ---EXPECT-- -okey -okey diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-win32.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt similarity index 81% rename from ext/sockets/tests/socket_sendrecvmsg_multi_msg-win32.phpt rename to ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt index 8de2bb5a97..6b46f33715 100644 --- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg-win32.phpt +++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg-unix.phpt @@ -1,18 +1,24 @@ --TEST-- -sendmsg()/recvmsg(): test ability to receive multiple messages (WIN32) +sendmsg()/recvmsg(): test ability to receive multiple messages --SKIPIF-- --FILE-- ["test ", "thing", "\n"], "control" => [[ "level" => IPPROTO_IPV6, - "type" => IPV6_PKTINFO, - "data" => [ - 'addr' => '::1', - 'ifindex' => 1 /* we're assuming loopback is 1. Is this a safe assumption? */ - ], + "type" => IPV6_TCLASS, + "data" => 40, ]] ], 0); var_dump($r); @@ -60,10 +63,10 @@ print_r($data); --EXPECTF-- creating send socket -resource(%d) of type (Socket) +resource(5) of type (Socket) bool(true) creating receive socket -resource(%d) of type (Socket) +resource(6) of type (Socket) bool(true) int(11) Array @@ -95,7 +98,7 @@ Array ( [level] => %d [type] => %d - [data] => 0 + [data] => 40 ) ) diff --git a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt index 6b46f33715..750b22dabf 100644 --- a/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt +++ b/ext/sockets/tests/socket_sendrecvmsg_multi_msg.phpt @@ -1,24 +1,16 @@ --TEST-- -sendmsg()/recvmsg(): test ability to receive multiple messages +sendmsg()/recvmsg(): test ability to receive multiple messages (WIN32) --SKIPIF-- --FILE-- ["test ", "thing", "\n"], "control" => [[ "level" => IPPROTO_IPV6, - "type" => IPV6_TCLASS, - "data" => 40, + "type" => IPV6_PKTINFO, + "data" => [ + 'addr' => '::1', + 'ifindex' => 1 /* we're assuming loopback is 1. Is this a safe assumption? */ + ], ]] ], 0); var_dump($r); @@ -63,10 +58,10 @@ print_r($data); --EXPECTF-- creating send socket -resource(5) of type (Socket) +resource(%d) of type (Socket) bool(true) creating receive socket -resource(6) of type (Socket) +resource(%d) of type (Socket) bool(true) int(11) Array @@ -98,7 +93,7 @@ Array ( [level] => %d [type] => %d - [data] => 40 + [data] => 0 ) ) diff --git a/ext/standard/tests/file/bug43353-win32.phpt b/ext/standard/tests/file/bug43353-win32.phpt deleted file mode 100644 index 76605d97a8..0000000000 --- a/ext/standard/tests/file/bug43353-win32.phpt +++ /dev/null @@ -1,25 +0,0 @@ ---TEST-- -Bug #43353 wrong detection of 'data' wrapper ---SKIPIF-- - ---INI-- -allow_url_fopen=1 ---FILE-- - ---EXPECTF-- -bool(false) -bool(false) -string(3) "foo" - -Warning: file_get_contents(datafoo:text/plain,foo): failed to open stream: No such file or directory in %s -bool(false) diff --git a/ext/standard/tests/file/bug43353.phpt b/ext/standard/tests/file/bug43353.phpt index 87d0650006..d9576f24e2 100644 --- a/ext/standard/tests/file/bug43353.phpt +++ b/ext/standard/tests/file/bug43353.phpt @@ -1,10 +1,5 @@ --TEST-- Bug #43353 wrong detection of 'data' wrapper ---SKIPIF-- - --INI-- allow_url_fopen=1 --FILE-- diff --git a/ext/standard/tests/file/bug44805.phpt b/ext/standard/tests/file/bug44805.phpt index 8e13c38629..c9a2918e9c 100644 --- a/ext/standard/tests/file/bug44805.phpt +++ b/ext/standard/tests/file/bug44805.phpt @@ -1,11 +1,5 @@ --TEST-- Bug#44806 (rename() function is not portable to Windows) ---SKIPIF-- - --FILE-- --FILE-- diff --git a/ext/standard/tests/general_functions/proc_open-win32-mb1.phpt b/ext/standard/tests/general_functions/proc_open-mb1.phpt similarity index 92% rename from ext/standard/tests/general_functions/proc_open-win32-mb1.phpt rename to ext/standard/tests/general_functions/proc_open-mb1.phpt index f1a70a23e8..7787b7aff1 100644 --- a/ext/standard/tests/general_functions/proc_open-win32-mb1.phpt +++ b/ext/standard/tests/general_functions/proc_open-mb1.phpt @@ -2,7 +2,6 @@ proc_open without bypass_shell subprocess parameter passing --SKIPIF-- diff --git a/ext/standard/tests/mail/bug69115.phpt b/ext/standard/tests/mail/bug69115.phpt index bc485de678..d907a3f520 100644 --- a/ext/standard/tests/mail/bug69115.phpt +++ b/ext/standard/tests/mail/bug69115.phpt @@ -1,11 +1,5 @@ --TEST-- Bug #69115 crash in mail (plus indirect pcre test) ---SKIPIF-- - --INI-- SMTP = smtp_port = diff --git a/ext/standard/tests/network/syslog_basic-win32.phpt b/ext/standard/tests/network/syslog_basic.phpt similarity index 80% rename from ext/standard/tests/network/syslog_basic-win32.phpt rename to ext/standard/tests/network/syslog_basic.phpt index 88d3c5a6d9..30f21cfb7a 100644 --- a/ext/standard/tests/network/syslog_basic-win32.phpt +++ b/ext/standard/tests/network/syslog_basic.phpt @@ -1,10 +1,5 @@ --TEST-- -Test syslog() function : basic functionality ---SKIPIF-- - +Test syslog() function : basic functionality --FILE-- --FILE-- @@ -29,7 +25,7 @@ unlink($fn); ?> ===DONE=== ---EXPECT-- +--EXPECT-- bool(true) string(3) "啊" ===DONE=== diff --git a/sapi/cli/tests/002-win32.phpt b/sapi/cli/tests/002-unix.phpt similarity index 63% rename from sapi/cli/tests/002-win32.phpt rename to sapi/cli/tests/002-unix.phpt index 6176625c5b..c67b93eba2 100644 --- a/sapi/cli/tests/002-win32.phpt +++ b/sapi/cli/tests/002-unix.phpt @@ -3,8 +3,8 @@ running code with -r --SKIPIF-- --FILE-- @@ -12,7 +12,7 @@ if (substr(PHP_OS, 0, 3) != 'WIN') { $php = getenv('TEST_PHP_EXECUTABLE'); -var_dump(`$php -n -r "var_dump('hello');"`); +var_dump(`$php -n -r 'var_dump("hello");'`); echo "Done\n"; ?> diff --git a/sapi/cli/tests/002.phpt b/sapi/cli/tests/002.phpt index c67b93eba2..496715376e 100644 --- a/sapi/cli/tests/002.phpt +++ b/sapi/cli/tests/002.phpt @@ -1,18 +1,15 @@ --TEST-- running code with -r --SKIPIF-- - --FILE-- diff --git a/sapi/cli/tests/argv_mb.phpt b/sapi/cli/tests/argv_mb.phpt index e8c47f0972..2a9d7a132a 100644 --- a/sapi/cli/tests/argv_mb.phpt +++ b/sapi/cli/tests/argv_mb.phpt @@ -1,11 +1,8 @@ --TEST-- Test basic argv multibyte API integration --SKIPIF-- - --FILE-- --INI-- open_basedir=. --FILE-- -- 2.40.0