Skip to content

Commit 56c970a

Browse files
JohannesKauffmannrobUx4
authored andcommitted
CI: use distcheck exclusively for building/testing
make_check_wrapper.sh + `make dist` does not replace make distcheck. `make distcheck` is used as single source of truth. To still get stack traces, move `make check` outside of the script and retrieve the exit code of `make distcheck`. This should catch issues like #27470 upfront.
1 parent 23fb14c commit 56c970a

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed

Diff for: extras/ci/gitlab-ci.yml

+7-12
Original file line numberDiff line numberDiff line change
@@ -284,21 +284,16 @@ debian:
284284
fi
285285
cd ../../
286286
287-
# Build VLC
287+
# Configure VLC
288288
./bootstrap
289289
./configure
290-
make -j$NCPU
291290
292-
# Run tests
293-
VLC_TEST_TIMEOUT=60 sh -x ./test/make_check_wrapper.sh -j4
294-
if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then
295-
export XZ_OPT="-T 0"
296-
make -j$NCPU distcheck
297-
else
298-
# Don't run distcheck but dist as it is already tested via
299-
# make_check_wrapper.sh
300-
make -j$NCPU dist
301-
fi
291+
# Allow core dumps for tracing test failures
292+
ulimit -c unlimited
293+
294+
# Build, check and distcheck VLC
295+
export XZ_OPT="-T 0"
296+
VLC_TEST_TIMEOUT=60 make -j$NCPU distcheck || ./test/dump_stacktraces.sh
302297
variables: *variables-debian
303298

304299
nightly-debian:

Diff for: test/make_check_wrapper.sh renamed to test/dump_stacktraces.sh

+7-5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
# Helper used to print more information (log + core dump) about a failing test
44

5-
ulimit -c unlimited
6-
7-
make check $*
8-
ret=$?
5+
if [ $# -gt 0 ];then
6+
# exit code passed in from stdin
7+
ret=$1
8+
else
9+
ret=1
10+
fi
911

10-
if [ $ret -eq 0 ] || ! (which gdb >/dev/null);then
12+
if [ $ret -eq 0 ] || ! (command -v gdb >/dev/null);then
1113
exit $ret
1214
fi
1315

0 commit comments

Comments
 (0)