Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
04ca2da
Move top-level run-tests.php code into a function
hikari-no-yume Oct 7, 2017
aec3dee
Add experimental parallel test execution support
hikari-no-yume Oct 8, 2017
5b7c0b7
Fix count() sorting
hikari-no-yume Oct 8, 2017
3017949
Add special error handler for run-tests workers
hikari-no-yume Oct 8, 2017
a93e815
Add experimental two- and four-worker parallel testing to Travis matrix
hikari-no-yume Oct 8, 2017
67ad564
Additional sanity checks
hikari-no-yume Oct 8, 2017
ea5f857
Track directories, not test files
hikari-no-yume Oct 8, 2017
d94f399
Don't check $test_idx == $test_cnt, REDIR means they don't match
hikari-no-yume Oct 8, 2017
24b6834
Don't repeatedly mark pipes non-blocking, once is enough
hikari-no-yume Oct 8, 2017
f31683e
Name and shame big test directories
hikari-no-yume Oct 8, 2017
cc3232b
Add per-directory flag to enable parallelisation
hikari-no-yume Oct 8, 2017
da5ae76
Flag low-hanging-fruit dirs with !CAN_BE_PARALLELISED
hikari-no-yume Oct 9, 2017
03ce2a3
Use 10s select() timeout
hikari-no-yume Oct 10, 2017
f6794e5
Use sockets on Windows
hikari-no-yume Oct 11, 2017
1fa336b
Use dynamically-allocated port
hikari-no-yume Oct 17, 2017
d06e513
Use sockets for comms on all platforms
hikari-no-yume Oct 17, 2017
c0e67d6
Add experimental two- and four-worker parallel testing to AppVeyor ma…
hikari-no-yume Oct 19, 2017
dea5ecf
Swap -j4 Travis tests for non-ZTS non-debug -j2
hikari-no-yume Oct 19, 2017
cabbfaa
Swap -j4 AppVeyor tests for non-ZTS non-debug -j2
hikari-no-yume Oct 19, 2017
69b648a
Skip I/O capture tests in parallel mode
hikari-no-yume Dec 18, 2017
b3289c1
Don't choke on huge messages(?)
hikari-no-yume Jul 5, 2018
a15c666
Don't choke on huge messages, approach 2
hikari-no-yume Jul 5, 2018
ca17490
blank commit to force rebuild
hikari-no-yume Jul 12, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,18 @@ environment:
matrix:
- THREAD_SAFE: 0
OPCACHE: 0
PARALLEL:
- THREAD_SAFE: 0
OPCACHE: 0
PARALLEL: -j2
- THREAD_SAFE: 1
OPCACHE: 1
INTRINSICS: AVX
PARALLEL:
- THREAD_SAFE: 1
OPCACHE: 1
INTRINSICS: AVX
PARALLEL: -j2

services:
# the setup scripts have to be touched, once some other db version is used
Expand Down
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@ env:
- PDO_MYSQL_TEST_HOST=127.0.0.1
- REPORT_EXIT_STATUS=1
matrix:
- ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
- ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
- ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0 PARALLEL_TESTS=0
- ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0 PARALLEL_TESTS=2
- ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1 PARALLEL_TESTS=0
- ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1 PARALLEL_TESTS=2

before_script:
- ccache --version
Expand All @@ -64,7 +66,7 @@ before_script:

# Run PHPs run-tests.php
script:
- ./sapi/cli/php run-tests.php -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120
- ./sapi/cli/php run-tests.php $(if [ $PARALLEL_TESTS -gt 0 ]; then echo "-j$PARALLEL_TESTS"; fi) -p `pwd`/sapi/cli/php $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120

after_success:
- ccache --show-stats
Empty file added Zend/tests/!CAN_BE_PARALLELISED
Empty file.
Empty file.
2 changes: 1 addition & 1 deletion appveyor/test_task.bat
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,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 -g FAIL,XFAIL,BORK,WARN,LEAK,SKIP --temp-source c:\tests_tmp --temp-target c:\tests_tmp"
nmake test TESTS="%OPCACHE_OPTS% %PARALLEL% -q --offline --show-diff --show-slow 1000 --set-timeout 120 -g FAIL,XFAIL,BORK,WARN,LEAK,SKIP --temp-source c:\tests_tmp --temp-target c:\tests_tmp"

set EXIT_CODE=%errorlevel%

Expand Down
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Loading