Skip to content

Commit 53e7141

Browse files
iluuu1994iluuu1994
authoredJul 31, 2022
Hide skipped tests in CI (php#9163)
1 parent 449edd8 commit 53e7141

File tree

10 files changed

+45
-7
lines changed

10 files changed

+45
-7
lines changed
 

‎.cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ task:
2525
tests_script:
2626
- export SKIP_IO_CAPTURE_TESTS=1
2727
- export CI_NO_IPV6=1
28-
- sapi/cli/php run-tests.php -P -q -j2 -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so
28+
- sapi/cli/php run-tests.php -P -q -j2 -g FAIL,BORK,LEAK,XLEAK --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so

‎.github/actions/test-linux/action.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Test
22
inputs:
3+
testArtifacts:
4+
default: null
5+
required: false
36
runTestsParameters:
47
default: ''
58
required: false
@@ -18,10 +21,17 @@ runs:
1821
export PDO_DBLIB_TEST_USER="pdo_test"
1922
export PDO_DBLIB_TEST_PASS="password"
2023
export SKIP_IO_CAPTURE_TESTS=1
24+
export TEST_PHP_JUNIT=junit.out.xml
2125
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
2226
-j$(/usr/bin/nproc) \
23-
-g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
27+
-g FAIL,BORK,LEAK,XLEAK \
2428
--offline \
2529
--show-diff \
2630
--show-slow 1000 \
2731
--set-timeout 120
32+
- uses: actions/upload-artifact@v3
33+
if: always() && inputs.testArtifacts != null
34+
with:
35+
name: ${{ github.job }}_${{ inputs.testArtifacts }}
36+
path: ${{ github.workspace }}/junit.out.xml
37+
retention-days: 5

‎.github/actions/test-macos/action.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
name: Test
22
inputs:
3+
testArtifacts:
4+
default: null
5+
required: false
36
runTestsParameters:
47
default: ''
58
required: false
@@ -11,10 +14,17 @@ runs:
1114
set -x
1215
export SKIP_IO_CAPTURE_TESTS=1
1316
export CI_NO_IPV6=1
17+
export TEST_PHP_JUNIT=junit.out.xml
1418
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
1519
-j$(sysctl -n hw.ncpu) \
16-
-g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
20+
-g FAIL,BORK,LEAK,XLEAK \
1721
--offline \
1822
--show-diff \
1923
--show-slow 1000 \
2024
--set-timeout 120
25+
- uses: actions/upload-artifact@v3
26+
if: always() && inputs.testArtifacts != null
27+
with:
28+
name: ${{ github.job }}_${{ inputs.testArtifacts }}
29+
path: ${{ github.workspace }}/junit.out.xml
30+
retention-days: 5

‎.github/workflows/nightly.yml

+9
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,13 @@ jobs:
6767
- name: Test
6868
uses: ./.github/actions/test-linux
6969
with:
70+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
7071
runTestsParameters: >-
7172
${{ matrix.run_tests_parameters }}
7273
- name: Test Tracing JIT
7374
uses: ./.github/actions/test-linux
7475
with:
76+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
7577
runTestsParameters: >-
7678
${{ matrix.run_tests_parameters }}
7779
-d zend_extension=opcache.so
@@ -80,13 +82,15 @@ jobs:
8082
- name: Test OpCache
8183
uses: ./.github/actions/test-linux
8284
with:
85+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
8386
runTestsParameters: >-
8487
${{ matrix.run_tests_parameters }}
8588
-d zend_extension=opcache.so
8689
-d opcache.enable_cli=1
8790
- name: Test Function JIT
8891
uses: ./.github/actions/test-linux
8992
with:
93+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
9094
runTestsParameters: >-
9195
${{ matrix.run_tests_parameters }}
9296
-d zend_extension=opcache.so
@@ -127,9 +131,12 @@ jobs:
127131
run: sudo make install
128132
- name: Test
129133
uses: ./.github/actions/test-macos
134+
with:
135+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
130136
- name: Test Tracing JIT
131137
uses: ./.github/actions/test-macos
132138
with:
139+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
133140
runTestsParameters: >-
134141
-d zend_extension=opcache.so
135142
-d opcache.enable_cli=1
@@ -138,13 +145,15 @@ jobs:
138145
- name: Test OpCache
139146
uses: ./.github/actions/test-macos
140147
with:
148+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
141149
runTestsParameters: >-
142150
-d zend_extension=opcache.so
143151
-d opcache.enable_cli=1
144152
-d opcache.protect_memory=1
145153
- name: Test Function JIT
146154
uses: ./.github/actions/test-macos
147155
with:
156+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
148157
runTestsParameters: >-
149158
-d zend_extension=opcache.so
150159
-d opcache.enable_cli=1

‎.github/workflows/push.yml

+6
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@ jobs:
5050
uses: ./.github/actions/setup-x64
5151
- name: Test
5252
uses: ./.github/actions/test-linux
53+
with:
54+
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
5355
- name: Test Tracing JIT
5456
uses: ./.github/actions/test-linux
5557
with:
58+
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
5659
runTestsParameters: >-
5760
-d zend_extension=opcache.so
5861
-d opcache.enable_cli=1
@@ -78,9 +81,12 @@ jobs:
7881
run: sudo make install
7982
- name: Test
8083
uses: ./.github/actions/test-macos
84+
with:
85+
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
8186
- name: Test Tracing JIT
8287
uses: ./.github/actions/test-macos
8388
with:
89+
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
8490
runTestsParameters: >-
8591
-d zend_extension=opcache.so
8692
-d opcache.enable_cli=1

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ tmp-php.ini
281281
# GitHub actions cache
282282
# ------------------------------------------------------------------------------
283283
/branch-commit-cache.json
284+
/junit.out.xml
284285

285286
# ------------------------------------------------------------------------------
286287
# Special cases to invert previous ignore patterns

‎azure/libmysqlclient_test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ steps:
3434
export REPORT_EXIT_STATUS=no
3535
rm -rf junit.xml | true
3636
sapi/cli/php run-tests.php -P -q \
37-
-g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
37+
-g FAIL,BORK,LEAK,XLEAK \
3838
--offline --show-diff --show-slow 1000 --set-timeout 120 \
3939
ext/pdo_mysql
4040
displayName: 'Test ${{ parameters.configurationName }}'

‎azure/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ steps:
1818
rm -rf junit.xml | true
1919
sapi/cli/php run-tests.php -P -q \
2020
-j$(/usr/bin/nproc) \
21-
-g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
21+
-g FAIL,BORK,LEAK,XLEAK \
2222
--offline \
2323
--show-diff \
2424
--show-slow 1000 \

‎run-tests.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -2690,7 +2690,9 @@ function run_test(string $php, $file, array $env): string
26902690
$orig_shortname = str_replace(TEST_PHP_SRCDIR . '/', '', $file);
26912691
$diff = "# original source file: $orig_shortname\n" . $diff;
26922692
}
2693-
show_file_block('diff', $diff);
2693+
if (!$SHOW_ONLY_GROUPS || array_intersect($restype, $SHOW_ONLY_GROUPS)) {
2694+
show_file_block('diff', $diff);
2695+
}
26942696
if (strpos($log_format, 'D') !== false && file_put_contents($diff_filename, $diff) === false) {
26952697
error("Cannot create test diff - $diff_filename");
26962698
}

‎travis/test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [ -z "$ARM64" ]; then export JOBS=$(nproc); else export JOBS=16; fi
66

77
export SKIP_IO_CAPTURE_TESTS=1
88
./sapi/cli/php run-tests.php -P \
9-
-g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 \
9+
-g "FAIL,BORK,LEAK" --offline --show-diff --show-slow 1000 \
1010
--set-timeout 120 -j$JOBS \
1111
-d extension=`pwd`/modules/zend_test.so \
1212
-d zend_extension=`pwd`/modules/opcache.so \

0 commit comments

Comments
 (0)
Please sign in to comment.