make sure not to run the restart test at the same time as the non-restarted test

normally, this should fine as it was before this patch because the
non-restarted tests produces more timesteps than the restarted one and
only the last file gets verified, but it used to be quite a hack and
one never knows, so it's wise to explicitly specify this as a
dependency.

Also, this change makes sure that ctest is aware of the number of
cores required by a test, which should lead to less contention...
This commit is contained in:
Andreas Lauser 2014-03-06 16:42:34 +01:00
parent 2f8118e5a6
commit 3479b659aa

View File

@ -12,7 +12,7 @@ usage() {
echo "Usage:"
echo
echo "runTest.sh TEST_TYPE TEST_BINARY [TEST_ARGS]"
echo "where TEST_TYPE can either be --plain or --simulation (is '$TEST_TYPE')."
echo "where TEST_TYPE can either be --plain or --simulation=\$NUM_CORES (is '$TEST_TYPE')."
};
validateResults() {
@ -108,8 +108,9 @@ case "$TEST_TYPE" in
exit 0
;;
"--parallel-simulation")
NUM_PROCS=4
"--parallel-simulation="*)
NUM_PROCS="${TEST_TYPE/--parallel-simulation=/}"
mpirun -np "$NUM_PROCS" "$TEST_BINARY" $TEST_ARGS | tee "test-$RND.log"
RET="${PIPESTATUS[0]}"
if test "$RET" != "0"; then