From: Eric Biggers <ebiggers@kernel.org>
To: Theodore Ts'o <tytso@mit.edu>
Cc: fstests@vger.kernel.org
Subject: [xfstests-bld PATCH] {kvm,gce}-xfstests: fix the --update-xfstests-tar option
Date: Thu, 23 Jun 2022 11:21:31 -0700 [thread overview]
Message-ID: <20220623182131.210809-1-ebiggers@kernel.org> (raw)
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
next reply other threads:[~2022-06-23 19:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-23 18:21 Eric Biggers [this message]
2022-06-24 3:48 ` [xfstests-bld PATCH] {kvm,gce}-xfstests: fix the --update-xfstests-tar option Theodore Ts'o
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220623182131.210809-1-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.