From 85be06af393c8d4d698bebdfdb221754e58fd03b Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Thu, 9 Apr 2020 20:06:53 +0800
Subject: [PATCH] Merge #18562: ci: Run unit tests sequential once

fa7af33b4cb12315de86315c163393bdb50fad75 ci: Run unit tests sequential once (MarcoFalke)
fa68a3e7640fc00c47f03fa565357679bdafb4b2 appveyor: Enable minimal unit test logging to aid debugging (MarcoFalke)

Pull request description:

  Fixes #16976

Top commit has no ACKs.

Tree-SHA512: 1f1ee8776a67afa8c1c5a16ef170c9975b6a486c087c8eba12e97d23382befd1c2801622ec70ca8e4cd1fbedce1dec46be67677ceaf07f35f1d3f3bead0200f0
---
 ci/dash/test_unittests.sh          | 8 ++++++--
 ci/test/00_setup_env_native_qt5.sh | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ci/dash/test_unittests.sh b/ci/dash/test_unittests.sh
index e97d234348..0b7bbf46db 100755
--- a/ci/dash/test_unittests.sh
+++ b/ci/dash/test_unittests.sh
@@ -11,7 +11,7 @@ set -e
 
 source ./ci/dash/matrix.sh
 
-if [ "$RUN_UNIT_TESTS" != "true" ]; then
+if [ "$RUN_UNIT_TESTS" != "true" ] && [ "$RUN_UNIT_TESTS_SEQUENTIAL" != "true" ]; then
   echo "Skipping unit tests"
   exit 0
 fi
@@ -29,5 +29,9 @@ if [ "$DIRECT_WINE_EXEC_TESTS" = "true" ]; then
   # Inside Docker, binfmt isn't working so we can't trust in make invoking windows binaries correctly
   wine ./src/test/test_dash.exe
 else
-  make $MAKEJOBS check VERBOSE=1
+  if [ "$RUN_UNIT_TESTS_SEQUENTIAL" = "true" ]; then
+    ./src/test/test_dash --catch_system_errors=no -l test_suite
+  else
+      make $MAKEJOBS check VERBOSE=1
+  fi
 fi
diff --git a/ci/test/00_setup_env_native_qt5.sh b/ci/test/00_setup_env_native_qt5.sh
index 38c9921a6b..4ee843d25b 100755
--- a/ci/test/00_setup_env_native_qt5.sh
+++ b/ci/test/00_setup_env_native_qt5.sh
@@ -11,5 +11,7 @@ export PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libdbus-1-dev libhar
 export DEP_OPTS="NO_UPNP=1 DEBUG=1"
 # TODO: we have few rpcs that aren't covered by any test, re-enable the line below once it's fixed
 # export TEST_RUNNER_EXTRA="--coverage --extended --exclude feature_pruning,feature_dbcrash"  # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash
+export RUN_UNIT_TESTS_SEQUENTIAL="true"
+export RUN_UNIT_TESTS="false"
 export GOAL="install"
 export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-zmq --enable-reduce-exports LDFLAGS=-static-libstdc++"