{kvm,gce}-xfstests: fix the --update-xfstests-tar option
PATCH 1/1 {kvm,gce}-xfstests: fix the --update-xfstests-tar option
From: Eric Biggers <[email protected]>
Make --update-xfstests-tar work with the new directory organization.
Signed-off-by Eric Biggers <[email protected]>
--- run-fstests/gce-xfstests | 2 +- run-fstests/kvm-xfstests | 2 +- run-fstests/util/parse_cli | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-)
run-fstests/gce-xfstests +1 -1
@@ -806,7 +806,7 @@ fi if test -z "$NO_ACTION" -a "$UPDATE_XFSTESTS" = "yes" then - LOCAL_XFSTESTS="$DIR/../xfstests.tar.gz" + LOCAL_XFSTESTS="$DIR/../fstests-bld/xfstests.tar.gz" GS_XFSTESTS="gs://$GS_BUCKET/xfstests.tar.gz" get_local_hash "$LOCAL_XFSTESTS" get_remote_hash "$GS_XFSTESTS"
run-fstests/kvm-xfstests +1 -1
@@ -132,7 +132,7 @@ tar -c -f "$VDH" -T /dev/null if test -z "$NO_ACTION" -a "$UPDATE_XFSTESTS" = "yes" then - tar -r -f $VDH -C "$DIR/.." xfstests.tar.gz + tar -r -f $VDH -C "$DIR/../fstests-bld" xfstests.tar.gz fi if test -z "$NO_ACTION" -a "$UPDATE_EXTRA_TESTS" = "yes"
run-fstests/util/parse_cli +2 -4
@@ -402,17 +402,15 @@ while (( $# >= 1 )); do supported_flavors kvm gce UPDATE_XFSTESTS_TAR=yes UPDATE_XFSTESTS=yes - UPDATE_XFSTESTS_DIR="$DIR/.." ;; --update-xfstests) supported_flavors kvm gce - if ! test -f "$DIR/../xfstests.tar.gz" + if ! test -f "$DIR/../fstests-bld/xfstests.tar.gz" then echo "The xfstests.tar.gz file has not been built!" exit 1 fi UPDATE_XFSTESTS=yes - UPDATE_XFSTESTS_DIR="$DIR/.." ;; --update-files) supported_flavors kvm gce
@@ -1032,7 +1030,7 @@ fi find_kernel_to_use if test -n "$UPDATE_XFSTESTS_TAR" ; then - (cd $DIR/.. ; ./gen-tarball --fast) + (cd "$DIR/../fstests-bld" ; ./gen-tarball --fast) fi if test -n "$PMEM_DEVICE" ; then
base-commit: 3b4b532e7c82bb17dbe50cf30ff933554ebf28cb
Signature · 1 line
2.36.1
Theodore Ts'o
AppliedQuoted 5 lines · Eric Biggers
From: Eric Biggers <[email protected]>
Make --update-xfstests-tar work with the new directory organization.
Signed-off-by Eric Biggers <[email protected]>
Thanks, applied.
- Ted