@@ -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"
@@ -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"
@@ -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