From 545cfcc92fc5bb4fc7280abf4f7aad543de18985 Mon Sep 17 00:00:00 2001
From: Ivan Komissarov <abbapoh@gmail.com>
Date: Sun, 23 Oct 2022 21:11:05 +0300
Subject: GitHub actions: Do not run tests in parallel

xargs parallel behavior is weird and it does not
propagate child process errors (at least, on macos).

Change-Id: I9571c0c689ee92f8852e942720ffaeb0f9de2579
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 scripts/test-qbs.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/scripts/test-qbs.sh b/scripts/test-qbs.sh
index 55dc6524e..2f28cde75 100755
--- a/scripts/test-qbs.sh
+++ b/scripts/test-qbs.sh
@@ -38,7 +38,7 @@
 ##
 #############################################################################
 
-set -eu
+set -eu -o pipefail
 
 #
 # Qbs is built with the address sanitizer enabled.
@@ -48,12 +48,6 @@ export LSAN_OPTIONS="suppressions=$( cd "$(dirname "$0")" ; pwd -P )/address-san
 
 export PATH="$1:$PATH"
 
-CPUS=$("$(dirname "$0")"/cpu-count.sh)
-
 export QBS_AUTOTEST_PROFILE=${QBS_AUTOTEST_PROFILE:-qt}
-echo "Running Qbs tests (${CPUS} jobs in parallel)."
-find $1 -name "tst_*" \
-    | grep -v tst_blackbox-joblimits \
-    | xargs -I{} -n1 -P${CPUS} bash -c \
-        'export LOG=$(mktemp) ; $({} > ${LOG} 2>&1) ; export RESULT=$? ; cat ${LOG} ; exit ${RESULT}'
-tst_blackbox-joblimits
+echo "Running Qbs tests."
+find $1 -name "tst*" | xargs -I{} -n1 {}
-- 
cgit v1.2.1