aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2022-10-23 21:11:05 +0300
committerIvan Komissarov <ABBAPOH@gmail.com>2022-10-24 18:21:35 +0000
commit545cfcc92fc5bb4fc7280abf4f7aad543de18985 (patch)
treeee47f459a3abebe7aaadcf58d6f2105c203a1fe7
parent098b8066a4cf20537af920bc9bf8d337e42f4f92 (diff)
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>
-rwxr-xr-xscripts/test-qbs.sh12
1 files 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 {}