diff --git a/.travis.yml b/.travis.yml index 8374844cec..50adfc2ef4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -192,13 +192,6 @@ after_success: FILE_ENV="./ci/test/00_setup_env_arm.sh" QEMU_USER_CMD="" - - stage: test - name: 'S390x [GOAL: install] [focal] [unit tests, functional tests]' - arch: s390x # Can disable QEMU_USER_CMD and run the tests natively without qemu - env: >- - FILE_ENV="./ci/test/00_setup_env_s390x.sh" - QEMU_USER_CMD="" - - stage: test name: 'Win64 [GOAL: deploy] [unit tests, no gui, no boost::process, no functional tests]' env: >- diff --git a/ci/dash/test_unittests.sh b/ci/dash/test_unittests.sh index 1b0796b340..02e3af883d 100755 --- a/ci/dash/test_unittests.sh +++ b/ci/dash/test_unittests.sh @@ -29,8 +29,8 @@ if [ "$DIRECT_WINE_EXEC_TESTS" = "true" ]; then wine ./src/test/test_dash.exe else if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then - ./src/test/test_dash --catch_system_errors=no -l test_suite + ${TEST_RUNNER_ENV} ./src/test/test_dash --catch_system_errors=no -l test_suite else - make $MAKEJOBS check VERBOSE=1 + ${TEST_RUNNER_ENV} make $MAKEJOBS check VERBOSE=1 fi fi diff --git a/ci/test/00_setup_env_s390x.sh b/ci/test/00_setup_env_s390x.sh index a46bde95b5..c71a4891b9 100644 --- a/ci/test/00_setup_env_s390x.sh +++ b/ci/test/00_setup_env_s390x.sh @@ -19,6 +19,7 @@ fi # Use debian to avoid 404 apt errors export CONTAINER_NAME=ci_s390x export RUN_UNIT_TESTS=true +export TEST_RUNNER_ENV="LC_ALL=C" export RUN_FUNCTIONAL_TESTS=true export GOAL="install" export BITCOIN_CONFIG="--enable-reduce-exports --disable-gui-tests --with-boost-process" # GUI tests disabled for now, see https://github.com/bitcoin/bitcoin/issues/23730