Skip to content

Commit dcef5ad

Browse files
author
MarcoFalke
committed
Merge #18562: ci: Run unit tests sequential once
fa7af33 ci: Run unit tests sequential once (MarcoFalke) fa68a3e appveyor: Enable minimal unit test logging to aid debugging (MarcoFalke) Pull request description: Fixes #16976 Top commit has no ACKs. Tree-SHA512: 1f1ee8776a67afa8c1c5a16ef170c9975b6a486c087c8eba12e97d23382befd1c2801622ec70ca8e4cd1fbedce1dec46be67677ceaf07f35f1d3f3bead0200f0
2 parents 661bd5d + fa7af33 commit dcef5ad

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ after_build:
8181
- ps: clcache -z
8282
#- 7z a bitcoin-%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\build_msvc\%platform%\%configuration%\*.exe
8383
test_script:
84-
- cmd: src\test_bitcoin.exe -k stdout -e stdout 2> NUL
84+
- cmd: src\test_bitcoin.exe -l test_suite
8585
- cmd: src\bench_bitcoin.exe -evals=1 -scaling=0 > NUL
8686
- ps: python test\util\bitcoin-util-test.py
8787
- cmd: python test\util\rpcauth-test.py

ci/test/00_setup_env_native_qt5.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ export CONTAINER_NAME=ci_native_qt5
1010
export PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libharfbuzz-dev"
1111
export DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1"
1212
export TEST_RUNNER_EXTRA="--coverage --extended --exclude feature_dbcrash" # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash
13+
export RUN_UNIT_TESTS_SEQUENTIAL="true"
14+
export RUN_UNIT_TESTS="false"
1315
export GOAL="install"
1416
export TEST_PREVIOUS_RELEASES=true
1517
export BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports --enable-debug CFLAGS=\"-g0 -O2 -funsigned-char\" CXXFLAGS=\"-g0 -O2 -funsigned-char\""

ci/test/06_script_b.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,20 @@ if [ -n "$USE_VALGRIND" ]; then
2121
END_FOLD
2222
fi
2323

24+
bash -c "${CI_WAIT}" & # Print dots in case the tests take a long time to run
25+
2426
if [ "$RUN_UNIT_TESTS" = "true" ]; then
2527
BEGIN_FOLD unit-tests
26-
bash -c "${CI_WAIT}" & # Print dots in case the unit tests take a long time to run
2728
DOCKER_EXEC LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib make $MAKEJOBS check VERBOSE=1
2829
END_FOLD
2930
fi
3031

32+
if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
33+
BEGIN_FOLD unit-tests-seq
34+
DOCKER_EXEC LD_LIBRARY_PATH=$DEPENDS_DIR/$HOST/lib "${BASE_ROOT_DIR}/build/bitcoin-*/src/test/test_bitcoin" --catch_system_errors=no -l test_suite
35+
END_FOLD
36+
fi
37+
3138
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
3239
BEGIN_FOLD functional-tests
3340
DOCKER_EXEC test/functional/test_runner.py --ci $MAKEJOBS --tmpdirprefix "${BASE_SCRATCH_DIR}/test_runner/" --ansi --combinedlogslen=4000 ${TEST_RUNNER_EXTRA} --quiet --failfast

0 commit comments

Comments
 (0)