Skip to content

Commit e2b90af

Browse files
committed
Testing
1 parent f6f8ccc commit e2b90af

File tree

4 files changed

+52
-48
lines changed

4 files changed

+52
-48
lines changed

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

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,31 @@ inputs:
99
runs:
1010
using: composite
1111
steps:
12+
# - shell: bash
13+
# run: |
14+
# set -x
15+
# export MYSQL_TEST_USER=root
16+
# export MYSQL_TEST_PASSWD=root
17+
# export PDO_MYSQL_TEST_DSN="mysql:host=localhost;dbname=test"
18+
# export PDO_MYSQL_TEST_USER=root
19+
# export PDO_MYSQL_TEST_PASS=root
20+
# export PDO_DBLIB_TEST_DSN="dblib:host=127.0.0.1;dbname=master;version=7.0"
21+
# export PDO_DBLIB_TEST_USER="pdo_test"
22+
# export PDO_DBLIB_TEST_PASS="password"
23+
# export SKIP_IO_CAPTURE_TESTS=1
24+
# export TEST_PHP_JUNIT=junit.out.xml
25+
# sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
26+
# -j$(/usr/bin/nproc) \
27+
# -g FAIL,BORK,WARN,LEAK,XLEAK \
28+
# --offline \
29+
# --show-diff \
30+
# --show-slow 1000 \
31+
# --set-timeout 120
1232
- shell: bash
1333
run: |
14-
set -x
15-
export MYSQL_TEST_USER=root
16-
export MYSQL_TEST_PASSWD=root
17-
export PDO_MYSQL_TEST_DSN="mysql:host=localhost;dbname=test"
18-
export PDO_MYSQL_TEST_USER=root
19-
export PDO_MYSQL_TEST_PASS=root
20-
export PDO_DBLIB_TEST_DSN="dblib:host=127.0.0.1;dbname=master;version=7.0"
21-
export PDO_DBLIB_TEST_USER="pdo_test"
22-
export PDO_DBLIB_TEST_PASS="password"
23-
export SKIP_IO_CAPTURE_TESTS=1
24-
export TEST_PHP_JUNIT=junit.out.xml
25-
sapi/cli/php run-tests.php -P -q ${{ inputs.runTestsParameters }} \
26-
-j$(/usr/bin/nproc) \
27-
-g FAIL,BORK,WARN,LEAK,XLEAK \
28-
--offline \
29-
--show-diff \
30-
--show-slow 1000 \
31-
--set-timeout 120
34+
echo "Test" > junit.out.xml
3235
- uses: actions/upload-artifact@v3
3336
if: always()
3437
with:
35-
name: ${{ github.job }} ${{ inputs.testArtifacts }}
38+
name: ${{ github.job }}_${{ inputs.testArtifacts }}
3639
path: ${{ github.workspace }}/junit.out.xml

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@ runs:
2525
- uses: actions/upload-artifact@v3
2626
if: always()
2727
with:
28-
name: ${{ github.job }} ${{ inputs.testArtifacts }}
28+
name: ${{ github.job }}_${{ inputs.testArtifacts }}
2929
path: ${{ github.workspace }}/junit.out.xml

.github/workflows/nightly.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ jobs:
6767
- name: Test
6868
uses: ./.github/actions/test-linux
6969
with:
70-
testArtifacts: Test
70+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
7171
runTestsParameters: >-
7272
${{ matrix.run_tests_parameters }}
7373
- name: Test Tracing JIT
7474
uses: ./.github/actions/test-linux
7575
with:
76-
testArtifacts: Test Tracing JIT
76+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
7777
runTestsParameters: >-
7878
${{ matrix.run_tests_parameters }}
7979
-d zend_extension=opcache.so
@@ -82,15 +82,15 @@ jobs:
8282
- name: Test OpCache
8383
uses: ./.github/actions/test-linux
8484
with:
85-
testArtifacts: Test OpCache
85+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
8686
runTestsParameters: >-
8787
${{ matrix.run_tests_parameters }}
8888
-d zend_extension=opcache.so
8989
-d opcache.enable_cli=1
9090
- name: Test Function JIT
9191
uses: ./.github/actions/test-linux
9292
with:
93-
testArtifacts: Test Function JIT
93+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
9494
runTestsParameters: >-
9595
${{ matrix.run_tests_parameters }}
9696
-d zend_extension=opcache.so
@@ -132,11 +132,11 @@ jobs:
132132
- name: Test
133133
uses: ./.github/actions/test-macos
134134
with:
135-
testArtifacts: Test
135+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
136136
- name: Test Tracing JIT
137137
uses: ./.github/actions/test-macos
138138
with:
139-
testArtifacts: Test Tracing JIT
139+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
140140
runTestsParameters: >-
141141
-d zend_extension=opcache.so
142142
-d opcache.enable_cli=1
@@ -145,15 +145,15 @@ jobs:
145145
- name: Test OpCache
146146
uses: ./.github/actions/test-macos
147147
with:
148-
testArtifacts: Test OpCache
148+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} OpCache
149149
runTestsParameters: >-
150150
-d zend_extension=opcache.so
151151
-d opcache.enable_cli=1
152152
-d opcache.protect_memory=1
153153
- name: Test Function JIT
154154
uses: ./.github/actions/test-macos
155155
with:
156-
testArtifacts: Test Function JIT
156+
testArtifacts: ${{ matrix.branch.name }}_${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Function JIT
157157
runTestsParameters: >-
158158
-d zend_extension=opcache.so
159159
-d opcache.enable_cli=1

.github/workflows/push.yml

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,37 +32,38 @@ jobs:
3232
steps:
3333
- name: git checkout
3434
uses: actions/checkout@v2
35-
- name: Create mssql container
36-
uses: ./.github/actions/mssql
37-
- name: apt
38-
uses: ./.github/actions/apt-x64
39-
- name: ./configure
40-
uses: ./.github/actions/configure-x64
41-
with:
42-
configurationParameters: >-
43-
--${{ matrix.debug && 'enable' || 'disable' }}-debug
44-
--${{ matrix.zts && 'enable' || 'disable' }}-zts
45-
- name: make
46-
run: make -j$(/usr/bin/nproc) >/dev/null
47-
- name: make install
48-
uses: ./.github/actions/install-linux
49-
- name: Setup
50-
uses: ./.github/actions/setup-x64
35+
# - name: Create mssql container
36+
# uses: ./.github/actions/mssql
37+
# - name: apt
38+
# uses: ./.github/actions/apt-x64
39+
# - name: ./configure
40+
# uses: ./.github/actions/configure-x64
41+
# with:
42+
# configurationParameters: >-
43+
# --${{ matrix.debug && 'enable' || 'disable' }}-debug
44+
# --${{ matrix.zts && 'enable' || 'disable' }}-zts
45+
# - name: make
46+
# run: make -j$(/usr/bin/nproc) >/dev/null
47+
# - name: make install
48+
# uses: ./.github/actions/install-linux
49+
# - name: Setup
50+
# uses: ./.github/actions/setup-x64
5151
- name: Test
5252
uses: ./.github/actions/test-linux
5353
with:
54-
testArtifacts: Test
54+
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
5555
- name: Test Tracing JIT
5656
uses: ./.github/actions/test-linux
5757
with:
58-
testArtifacts: Test Tracing JIT
58+
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
5959
runTestsParameters: >-
6060
-d zend_extension=opcache.so
6161
-d opcache.enable_cli=1
6262
-d opcache.jit_buffer_size=16M
6363
- name: Verify generated files are up to date
6464
uses: ./.github/actions/verify-generated-files
6565
MACOS_DEBUG_NTS:
66+
if: false
6667
runs-on: macos-10.15
6768
steps:
6869
- name: git checkout
@@ -82,11 +83,11 @@ jobs:
8283
- name: Test
8384
uses: ./.github/actions/test-macos
8485
with:
85-
testArtifacts: Test
86+
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }}
8687
- name: Test Tracing JIT
8788
uses: ./.github/actions/test-macos
8889
with:
89-
testArtifacts: Test Tracing JIT
90+
testArtifacts: ${{ matrix.debug && 'DEBUG' || 'RELEASE' }}_${{ matrix.zts && 'ZTS' || 'NTS' }} Tracing JIT
9091
runTestsParameters: >-
9192
-d zend_extension=opcache.so
9293
-d opcache.enable_cli=1

0 commit comments

Comments
 (0)