Skip to content

Commit 16c4761

Browse files
pks-tTo1ne
authored andcommitted
ci: all the fixes
always upload reports, not only on failure upload meson logs remove unused script print failures no verbose log with meson it causes us to write somewhere else, but we want it in the meson test log
1 parent 5732e9d commit 16c4761

3 files changed

Lines changed: 17 additions & 17 deletions

File tree

.gitlab-ci.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,11 @@ test:linux:
6969
CC: gcc
7070
artifacts:
7171
paths:
72+
- build/meson-logs
7273
- t/failed-test-artifacts
7374
reports:
7475
junit: build/meson-logs/testlog.junit.xml
75-
when: on_failure
76+
when: always
7677

7778
test:osx:
7879
image: $image
@@ -111,10 +112,11 @@ test:osx:
111112
CC: clang
112113
artifacts:
113114
paths:
115+
- build/meson-logs
114116
- t/failed-test-artifacts
115117
reports:
116118
junit: build/meson-logs/testlog.junit.xml
117-
when: on_failure
119+
when: always
118120

119121
.windows_before_script: &windows_before_script
120122
# Disabling realtime monitoring fails on some of the runners, but it
@@ -183,11 +185,14 @@ test:msvc-meson:
183185
- job: "build:msvc-meson"
184186
artifacts: true
185187
script:
186-
- meson test -C build --no-rebuild --print-errorlogs --slice $Env:CI_NODE_INDEX/$Env:CI_NODE_TOTAL
188+
- meson test -C build --test-args=-x --no-rebuild --print-errorlogs --slice $Env:CI_NODE_INDEX/$Env:CI_NODE_TOTAL
187189
parallel: 10
188190
artifacts:
191+
paths:
192+
- build/meson-logs
189193
reports:
190194
junit: build/meson-logs/testlog.junit.xml
195+
when: always
191196

192197
test:fuzz-smoke-tests:
193198
image: ubuntu:latest

ci/lib.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,15 @@ fi
282282
MAKEFLAGS="$MAKEFLAGS --jobs=$JOBS"
283283
GIT_PROVE_OPTS="--timer --jobs $JOBS"
284284

285-
GIT_TEST_OPTS="$GIT_TEST_OPTS --verbose-log -x"
285+
GIT_TEST_OPTS="$GIT_TEST_OPTS -x"
286+
287+
case "$jobname" in
288+
*-meson)
289+
;;
290+
*)
291+
GIT_TEST_OPTS="$GIT_TEST_OPTS --verbose-log";;
292+
esac
293+
286294
case "$CI_OS_NAME" in
287295
windows|windows_nt)
288296
GIT_TEST_OPTS="$GIT_TEST_OPTS --no-chain-lint --no-bin-wrappers"

ci/run-test-slice-meson.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)