[PATCH] test-appliance: limit checkpointing to gce-xfstests only

[PATCH] test-appliance: limit checkpointing to gce-xfstests only

[Eric Biggers]

From: Eric Biggers <ebiggers@google.com>

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.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 kvm-xfstests/test-appliance/files/root/runtests.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/kvm-xfstests/test-appliance/files/root/runtests.sh b/kvm-xfstests/test-appliance/files/root/runtests.sh
index ec676a9..6544e1c 100755
--- a/kvm-xfstests/test-appliance/files/root/runtests.sh
+++ b/kvm-xfstests/test-appliance/files/root/runtests.sh
@@ -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
-- 
2.13.0.rc0.306.g87b477812d-goog

Re: [PATCH] test-appliance: limit checkpointing to gce-xfstests only

[Theodore Ts'o]

On Mon, May 01, 2017 at 10:04:32AM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> 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.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Nice catch, thanks!   Applied.

				- Ted