[xfstests-bld PATCH] {kvm,gce}-xfstests: fix the --update-xfstests-tar option

[xfstests-bld PATCH] {kvm,gce}-xfstests: fix the --update-xfstests-tar option

[Eric Biggers]

From: Eric Biggers <ebiggers@google.com>

Make --update-xfstests-tar work with the new directory organization.

Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 run-fstests/gce-xfstests   | 2 +-
 run-fstests/kvm-xfstests   | 2 +-
 run-fstests/util/parse_cli | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/run-fstests/gce-xfstests b/run-fstests/gce-xfstests
index 0127509..baf1fb9 100755
--- a/run-fstests/gce-xfstests
+++ b/run-fstests/gce-xfstests
@@ -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"
diff --git a/run-fstests/kvm-xfstests b/run-fstests/kvm-xfstests
index 10b90d8..db2fcdd 100755
--- a/run-fstests/kvm-xfstests
+++ b/run-fstests/kvm-xfstests
@@ -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"
diff --git a/run-fstests/util/parse_cli b/run-fstests/util/parse_cli
index 441170e..5848bf4 100644
--- a/run-fstests/util/parse_cli
+++ b/run-fstests/util/parse_cli
@@ -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
-- 
2.36.1

Re: [xfstests-bld PATCH] {kvm,gce}-xfstests: fix the --update-xfstests-tar option

[Theodore Ts'o]

On Thu, Jun 23, 2022 at 11:21:31AM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> Make --update-xfstests-tar work with the new directory organization.
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Thanks, applied.

						- Ted