Skip to content

Commit 786b6be

Browse files
committed
reset CI test changes, refactor out to next PR
1 parent 5f9c77f commit 786b6be

3 files changed

Lines changed: 14 additions & 19 deletions

File tree

.github/workflows/sanitizers.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@ jobs:
102102
run: echo "$(pwd)/php/target/bin" >> "$GITHUB_PATH"
103103
- name: Install e-dant/watcher
104104
uses: ./.github/actions/watcher
105-
- name: Install gotestsum
106-
run: go install gotest.tools/gotestsum@latest
107-
- name: Set CGO flags
105+
- name: Set Set CGO flags
108106
run: |
109107
{
110108
echo "CGO_CFLAGS=$CFLAGS -I${PWD}/watcher/target/include $(php-config --includes)"
111109
echo "CGO_LDFLAGS=$LDFLAGS $(php-config --ldflags) $(php-config --libs)"
112110
} >> "$GITHUB_ENV"
111+
- name: Compile tests
112+
run: go test ${{ matrix.sanitizer == 'msan' && '-tags=nowatcher' || '' }} -${{ matrix.sanitizer }} -v -x -c
113113
- name: Run tests
114-
run: gotestsum -- ${{ matrix.sanitizer == 'msan' && '-tags=nowatcher' || '' }} -${{ matrix.sanitizer }} ./...
114+
run: ./frankenphp.test -test.v

.github/workflows/tests.yaml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ jobs:
6464
- name: Build testcli binary
6565
working-directory: internal/testcli/
6666
run: go build
67-
- name: Install gotestsum
68-
run: go install gotest.tools/gotestsum@latest
67+
- name: Compile library tests
68+
run: go test -race -v -x -c
6969
- name: Run library tests
70-
run: gotestsum -- -race ./...
70+
run: ./frankenphp.test -test.v
7171
- name: Run Caddy module tests
7272
working-directory: caddy/
73-
run: gotestsum -- -race ./...
73+
run: go test -race -v ./...
7474
- name: Run Fuzzing Tests
7575
working-directory: caddy/
7676
run: go test -fuzz FuzzRequest -fuzztime 20s
@@ -136,11 +136,9 @@ jobs:
136136
run: |
137137
echo "CGO_CFLAGS=$(php-config --includes)" >> "${GITHUB_ENV}"
138138
echo "CGO_LDFLAGS=$(php-config --ldflags) $(php-config --libs)" >> "${GITHUB_ENV}"
139-
- name: Install gotestsum
140-
run: go install gotest.tools/gotestsum@latest
141139
- name: Run integration tests
142140
working-directory: internal/extgen/
143-
run: gotestsum -- -tags integration -timeout 30m
141+
run: go test -tags integration -v -timeout 30m
144142
tests-mac:
145143
name: Tests (macOS, PHP 8.5)
146144
runs-on: macos-latest
@@ -166,9 +164,7 @@ jobs:
166164
env:
167165
phpts: ts
168166
debug: true
169-
- name: Install gotestsum
170-
run: go install gotest.tools/gotestsum@latest
171-
- name: Set CGO flags
167+
- name: Set Set CGO flags
172168
run: |
173169
{
174170
echo "CGO_CFLAGS=-I/opt/homebrew/include/ $(php-config --includes)"
@@ -177,7 +173,7 @@ jobs:
177173
- name: Build
178174
run: go build -tags nowatcher
179175
- name: Run library tests
180-
run: gotestsum -- -tags nowatcher -race ./...
176+
run: go test -tags nowatcher -race -v ./...
181177
- name: Run Caddy module tests
182178
working-directory: caddy/
183-
run: gotestsum -- -race ./...
179+
run: go test -race -v ./...

.github/workflows/windows.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,9 @@ jobs:
228228
"opcache.enable=0`r`nopcache.enable_cli=0" | Out-File php.ini
229229
$env:PHPRC = Get-Location
230230
231-
go install gotest.tools/gotestsum@latest
232-
gotestsum -- -race ./...
231+
go test -race ./...
233232
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
234233
cd caddy
235-
gotestsum -- -race ./...
234+
go test -race ./...
236235
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
237236
working-directory: ${{ github.workspace }}\frankenphp

0 commit comments

Comments
 (0)