From c295a13ac6c72c999b577a14020ac34a45f7344d Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 6 Nov 2020 18:08:28 +0100
Subject: [PATCH] Merge #20315: travis: Remove s390x build

fa2c3c0d96b48bc1685d84186552f72e3609a331 ci: Set LC_ALL=C to allow running the s390x tests in qemu (MarcoFalke)
fac05178366a1c9100b1d19d66fb669d7266f306 travis: Remove s390x build (MarcoFalke)

Pull request description:

  This has been discussed in the last meeting.

  Refer to the commit body for more details.

Top commit has no ACKs.

Tree-SHA512: 8e0455286ce41c95ed2e5eb624ac534251bb4a321f13d26d14356497e0c39f841372e166373ffd4a0a9fa379636c2cfb535bd92534fff427cdcb827354e66b6c
---
 .travis.yml                   | 7 -------
 ci/dash/test_unittests.sh     | 4 ++--
 ci/test/00_setup_env_s390x.sh | 1 +
 3 files changed, 3 insertions(+), 9 deletions(-)

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