Skip to content

Commit fae610d

Browse files
author
MarcoFalke
committed
ci: Remove redundant RUN_UNIT_TESTS_SEQUENTIAL
1 parent 2562fe1 commit fae610d

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ jobs:
379379
- name: Run unit tests
380380
# Can't use ctest here like other jobs as we don't have a CMake build tree.
381381
run: |
382-
./bin/test_bitcoin.exe -l test_suite
382+
./bin/test_bitcoin.exe -l test_suite # Intentionally run sequentially here, to catch test case failures caused by dirty global state from prior test cases.
383383
./src/secp256k1/bin/exhaustive_tests.exe
384384
./src/secp256k1/bin/noverify_tests.exe
385385
./src/secp256k1/bin/tests.exe

ci/test/00_setup_env_native_previous_releases.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ export CI_IMAGE_NAME_TAG="mirror.gcr.io/ubuntu:22.04"
1212
export PACKAGES="gcc-11 g++-11 python3-zmq"
1313
export DEP_OPTS="CC=gcc-11 CXX=g++-11"
1414
export TEST_RUNNER_EXTRA="--previous-releases --coverage --extended --exclude feature_dbcrash" # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash
15-
export RUN_UNIT_TESTS_SEQUENTIAL="true"
16-
export RUN_UNIT_TESTS="false"
1715
export GOAL="install"
1816
export CI_LIMIT_STACK_SIZE=1
1917
export DOWNLOAD_PREVIOUS_RELEASES="true"

ci/test/03_test_script.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ if [ "$RUN_FUZZ_TESTS" = "true" ]; then
7474
echo "Using qa-assets repo from commit ..."
7575
git log -1
7676
)
77-
elif [ "$RUN_UNIT_TESTS" = "true" ] || [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
77+
elif [ "$RUN_UNIT_TESTS" = "true" ]; then
7878
export DIR_UNIT_TEST_DATA=${DIR_QA_ASSETS}/unit_test_data/
7979
if [ ! -d "$DIR_UNIT_TEST_DATA" ]; then
8080
mkdir -p "$DIR_UNIT_TEST_DATA"
@@ -176,10 +176,6 @@ if [ "$RUN_UNIT_TESTS" = "true" ]; then
176176
--timeout $(( TEST_RUNNER_TIMEOUT_FACTOR * 60 ))
177177
fi
178178

179-
if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
180-
DIR_UNIT_TEST_DATA="${DIR_UNIT_TEST_DATA}" LD_LIBRARY_PATH="${DEPENDS_DIR}/${HOST}/lib" "${BASE_BUILD_DIR}"/bin/test_bitcoin --catch_system_errors=no -l test_suite
181-
fi
182-
183179
if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
184180
# parses TEST_RUNNER_EXTRA as an array which allows for multiple arguments such as TEST_RUNNER_EXTRA='--exclude "rpc_bind.py --ipv6"'
185181
eval "TEST_RUNNER_EXTRA=($TEST_RUNNER_EXTRA)"

0 commit comments

Comments
 (0)