diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-03-22 11:23:35 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-03-25 10:38:06 +0000 |
| commit | 6dce3eae9f96a34c9bdf5e5df2dfbc0e2c4c6209 (patch) | |
| tree | 4d66269dda9216db2b7708b8d929c6b5cf905b8c | |
| parent | 6c671e10a307de3994cfd96a24fdce0c4f00e06c (diff) | |
Do not run joblimits in parallel with other tests
To avoid concurrent access to QSettings
Change-Id: I99e43d0b7cb19352fad4b16abb80fc88b0a11fd0
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| -rwxr-xr-x | scripts/test-qbs.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/test-qbs.sh b/scripts/test-qbs.sh index 07271c45d..55dc6524e 100755 --- a/scripts/test-qbs.sh +++ b/scripts/test-qbs.sh @@ -52,4 +52,8 @@ 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_*" | xargs -I{} -n1 -P${CPUS} bash -c 'export LOG=$(mktemp) ; $({} > ${LOG} 2>&1) ; export RESULT=$? ; cat ${LOG} ; exit ${RESULT}' +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 |