Skip to content

Commit 2dc7270

Browse files
committed
use gotestsum for other tests too (except fuzz test)
1 parent 7375dce commit 2dc7270

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/sanitizers.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
echo "CGO_CFLAGS=$CFLAGS -I${PWD}/watcher/target/include $(php-config --includes)"
109109
echo "CGO_LDFLAGS=$LDFLAGS $(php-config --ldflags) $(php-config --libs)"
110110
} >> "$GITHUB_ENV"
111-
- name: Compile tests
112-
run: go test ${{ matrix.sanitizer == 'msan' && '-tags=nowatcher' || '' }} -${{ matrix.sanitizer }} -v -x -c
111+
- name: Install gotestsum
112+
run: go install gotest.tools/gotestsum@latest
113113
- name: Run tests
114-
run: ./frankenphp.test -test.v
114+
run: gotestsum -- ${{ matrix.sanitizer == 'msan' && '-tags=nowatcher' || '' }} -${{ matrix.sanitizer }} ./...

.github/workflows/tests.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,11 @@ 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
139141
- name: Run integration tests
140142
working-directory: internal/extgen/
141-
run: go test -tags integration -v -timeout 30m
143+
run: gotestsum -- -tags integration -timeout 30m
142144
tests-mac:
143145
name: Tests (macOS, PHP 8.5)
144146
runs-on: macos-latest

.github/workflows/windows.yaml

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

0 commit comments

Comments
 (0)