test-appliance: limit checkpointing to gce-xfstests only
PATCH 1/1 test-appliance: limit checkpointing to gce-xfstests only
From: Eric Biggers <[email protected]>
Results checkpointing by filesystem config, as introduced by f3c85210f147 ("test-appliance: checkpoint fs configurations that are completed") only really makes sense for gce-xfstests, which uses a new results directory per GCE instance. It doesn't make sense for kvm-xfstests and android-xfstests because the same results directory may be reused for many different test runs, with different kernels and/or different sets of tests. Therefore, for now limit the checkpointing to gce-xfstests only.
--- kvm-xfstests/test-appliance/files/root/runtests.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
kvm-xfstests/test-appliance/files/root/runtests.sh +5 -2
@@ -304,7 +304,8 @@ do XFS_IO_AVOID="${XFS_IO_AVOID/# /}" fi echo $FS/$i > /run/fstest-config - if grep -q "^$FS/$i\$" "$RESULTS/fstest-completed" + if test -n "$RUN_ON_GCE" && \ + grep -q "^$FS/$i\$" "$RESULTS/fstest-completed" then echo "$FS/$i: already run" /usr/local/lib/gce-logger already run
@@ -440,7 +441,9 @@ END { if (NR > 0) { gce_run_hooks fs-config-end $i umount "$TEST_DIR" >& /dev/null umount "$SCRATCH_MNT" >& /dev/null - cat /run/fstest-config >> "$RESULTS/fstest-completed" + if test -n "$RUN_ON_GCE" ; then + cat /run/fstest-config >> "$RESULTS/fstest-completed" + fi echo -n "END TEST: $TESTNAME " ; date logger "END TEST $i: $TESTNAME " done
Signature · 1 line
2.13.0.rc0.306.g87b477812d-goog
Quoted 11 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Results checkpointing by filesystem config, as introduced by
f3c85210f147("test-appliance: checkpoint fs configurations that are completed") only really makes sense for gce-xfstests, which uses a new results directory per GCE instance. It doesn't make sense for kvm-xfstests and android-xfstests because the same results directory may be reused for many different test runs, with different kernels and/or different sets of tests. Therefore, for now limit the checkpointing to gce-xfstests only.
Quoted 1 line
Signed-off-by Eric Biggers <[email protected]>
Nice catch, thanks! Applied.
- Ted