summaryrefslogtreecommitdiff
path: root/t/parallel-tests-concurrency.sh
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2014-12-27 18:41:56 +0100
committerStefano Lattarini <stefano.lattarini@gmail.com>2014-12-27 18:41:56 +0100
commit50ae952fcbe12a086ef6bec7f4f2e46326e7b03d (patch)
tree9ed740c6c17b94072501f6d20094a95b9b7b7a2e /t/parallel-tests-concurrency.sh
parentc24233d4194639cf2f87ceee162b0f0525ecdbd3 (diff)
parent047e0cf6a836fc83a5ba335bf8eebd4fe354af0b (diff)
downloadautomake-50ae952fcbe12a086ef6bec7f4f2e46326e7b03d.tar.gz
Merge branch 'minor'
* minor: tests: fix spurious failure in test on TEXINFO_TEX overriding tests: avoid some spurious failures on AIX 7.1
Diffstat (limited to 't/parallel-tests-concurrency.sh')
-rw-r--r--t/parallel-tests-concurrency.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/t/parallel-tests-concurrency.sh b/t/parallel-tests-concurrency.sh
index e2c622b94..4a70e23f6 100644
--- a/t/parallel-tests-concurrency.sh
+++ b/t/parallel-tests-concurrency.sh
@@ -17,8 +17,8 @@
# Check parallel-tests features:
# - concurrent parallel execution
-# FIXME: we should factorize the code to determine how to run
-# make in parallel out in am-test-lib.sh ...
+# FIXME: we should factor out (into am-test-lib.sh?) the code to determine
+# how to run make in parallel mode ...
. test-init.sh
@@ -89,11 +89,16 @@ for build in serial parallel; do
done
cd serial
-$MAKE ${j}1 check &
-cd ../parallel
+# Do *not* use "make -j1" here; apparently, some make implementations
+# (e.g., AIX 7.1) interpret it as a synonym of "make -j" :-(
+$MAKE check &
+cd ..
+
+cd parallel
$sleep
run_make -O -- ${j}4 check
cd ..
+
# Ensure the tests are really being run in parallel mode: if this is
# the case, the serial run of the dummy testsuite started above should
# still be ongoing when the parallel one has terminated.