From 7745728669d39ff499dcdc893e70ce4aae50a90a Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 18 Mar 2020 15:02:36 -0400 Subject: [PATCH] vmcheck: Run vm_kola_spawn separately from if-statement Classic shell gotcha. We don't want to run `vm_kola_spawn` as part of the if-statement or otherwise we lose the `set -e` behaviour. --- tests/vmcheck/runtest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/vmcheck/runtest.sh b/tests/vmcheck/runtest.sh index 7479ba56..3a8d1714 100755 --- a/tests/vmcheck/runtest.sh +++ b/tests/vmcheck/runtest.sh @@ -37,8 +37,8 @@ export VMTESTS=1 # shellcheck source=../common/libvm.sh . "${commondir}/libvm.sh" -if vm_kola_spawn "${outputdir}/kola" && \ - "${topsrcdir}/tests/vmcheck/test-${testname}.sh"; then +vm_kola_spawn "${outputdir}/kola" +if "${topsrcdir}/tests/vmcheck/test-${testname}.sh"; then echo "PASS: ${testname}" >&3 else echo "FAIL: ${testname}" >&3