diff --git a/.github/actions/test-linux/action.yml b/.github/actions/test-linux/action.yml index 7db8fa58900d..729224202a4f 100644 --- a/.github/actions/test-linux/action.yml +++ b/.github/actions/test-linux/action.yml @@ -27,7 +27,6 @@ runs: sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ -j$(/usr/bin/nproc) \ -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \ - --offline \ --show-diff \ --show-slow 1000 \ --set-timeout 120 diff --git a/.github/actions/test-macos/action.yml b/.github/actions/test-macos/action.yml index 99ac49b268c7..864a75c279f5 100644 --- a/.github/actions/test-macos/action.yml +++ b/.github/actions/test-macos/action.yml @@ -14,7 +14,6 @@ runs: sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \ -j$(sysctl -n hw.ncpu) \ -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \ - --offline \ --show-diff \ --show-slow 1000 \ --set-timeout 120 diff --git a/.travis.yml b/.travis.yml index 59ee5ebb2194..8ad9263facd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,7 +91,7 @@ before_script: script: # ARM64 CI reports nproc=32, which is excessive. - if [ -z "$ARM64" ]; then export JOBS=$(nproc); else export JOBS=16; fi - - ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 -j$JOBS + - ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --show-diff --show-slow 1000 --set-timeout 120 -j$JOBS - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");' after_success: diff --git a/appveyor/test_task.bat b/appveyor/test_task.bat index a97731a6ddd3..b9fb457c32c9 100644 --- a/appveyor/test_task.bat +++ b/appveyor/test_task.bat @@ -98,7 +98,7 @@ mkdir c:\tests_tmp set TEST_PHP_JUNIT=c:\junit.out.xml cd "%APPVEYOR_BUILD_FOLDER%" -nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp %PARALLEL%" +nmake test TESTS="%OPCACHE_OPTS% -q --show-diff --show-slow 1000 --set-timeout 120 --temp-source c:\tests_tmp --temp-target c:\tests_tmp %PARALLEL%" set EXIT_CODE=%errorlevel% diff --git a/azure/test.yml b/azure/test.yml index 1e2e1d6a1e3e..9e47ad17fa3b 100644 --- a/azure/test.yml +++ b/azure/test.yml @@ -16,7 +16,6 @@ steps: php run-tests.php -P -q \ -j$(/usr/bin/nproc) \ -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \ - --offline \ --show-diff \ --show-slow 1000 \ --set-timeout 120 \ diff --git a/ext/sockets/tests/socket_send.phpt b/ext/sockets/tests/socket_send.phpt index 71ba5b028f8d..0affd6bf83a1 100644 --- a/ext/sockets/tests/socket_send.phpt +++ b/ext/sockets/tests/socket_send.phpt @@ -23,8 +23,10 @@ if(socket_send($socket, $stringSocket, $stringSocketLength, MSG_OOB)===$stringSo print("okey\n"); } -if(!defined('MSG_EOR') || socket_send($socket, $stringSocket, $stringSocketLength, MSG_EOR)===$stringSocketLength){ - print("okey\n"); +if (PHP_OS !== "Darwin") { // MSG_EOR seems unsupported on MacOS + if(!defined('MSG_EOR') || socket_send($socket, $stringSocket, $stringSocketLength, MSG_EOR)===$stringSocketLength){ + print("okey\n"); + } } if(!defined('MSG_EOF') || socket_send($socket, $stringSocket, $stringSocketLength, MSG_EOF)===$stringSocketLength){ diff --git a/ext/xmlreader/tests/bug70309.phpt b/ext/xmlreader/tests/bug70309.phpt deleted file mode 100644 index 199ad5df5fe9..000000000000 --- a/ext/xmlreader/tests/bug70309.phpt +++ /dev/null @@ -1,44 +0,0 @@ ---TEST-- -XMLReader: Bug #70309 XmlReader read generates extra output ---SKIPIF-- - - - - ---FILE-- -xml(' - -Test Chapter - -This is a paragraph in the test chapter. It is unremarkable in -every regard. This is a paragraph in the test chapter. It is -unremarkable in every regard. This is a paragraph in the test -chapter. It is unremarkable in every regard. - - -This paragraph contains -some emphasized text -1and a superscript -and a subscript. - - -This is a paragraph in the test chapter. It is unremarkable in -every regard. This is a paragraph in the test chapter. It is -unremarkable in every regard. This is a paragraph in the test -chapter. It is unremarkable in every regard. - -'); - -$doc->setRelaxNGSchema('http://docs.oasis-open.org/docbook/rng/5.0/docbook.rng'); - -while (@$doc->read() !== false); -?> -===DONE=== ---EXPECT-- -===DONE===