apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfstests: fix common source file path

Browse Source 
After the re-factor, common.* have been renamed to common/* but there
are several files still look for the old path, fix it.

Signed-off-by: Eryu Guan <eguan@redhat.com>
Reviewed-by: Rich Johnston <rjohnston@sgi.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Eryu Guan
2013-03-29 04:49:55 +00:00
committed by Rich Johnston
parent 0edeaaab2a
commit 8575764a79
11 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/config
+5 -5
View File
@@ -241,12 +241,12 @@ fi
echo $TEST_DEV | grep -q ":" > /dev/null 2>&1
if [ ! -b "$TEST_DEV" -a "$?" != "0" ]; then
echo "common.config: Error: \$TEST_DEV ($TEST_DEV) is not a block device or a NFS filesystem"
echo "common/config: Error: \$TEST_DEV ($TEST_DEV) is not a block device or a NFS filesystem"
exit 1
fi
if [ ! -d "$TEST_DIR" ]; then
echo "common.config: Error: \$TEST_DIR ($TEST_DIR) is not a directory"
echo "common/config: Error: \$TEST_DIR ($TEST_DIR) is not a directory"
exit 1
fi
@@ -254,7 +254,7 @@ fi
# to SCRATCH_DEV and rest to SCRATCH_DEV_POOL to maintain the backward compatibility
if [ ! -z "$SCRATCH_DEV_POOL" ]; then
if [ ! -z "$SCRATCH_DEV" ]; then
echo "common.config: Error: \$SCRATCH_DEV should be unset when \$SCRATCH_DEV_POOL is set"
echo "common/config: Error: \$SCRATCH_DEV should be unset when \$SCRATCH_DEV_POOL is set"
exit 1
fi
SCRATCH_DEV=`echo $SCRATCH_DEV_POOL | awk '{print $1}'`
@@ -263,12 +263,12 @@ fi
echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" -a "$?" != "0" ]; then
echo "common.config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) is not a block device or a NFS filesystem"
echo "common/config: Error: \$SCRATCH_DEV ($SCRATCH_DEV) is not a block device or a NFS filesystem"
exit 1
fi
if [ ! -z "$SCRATCH_MNT" -a ! -d "$SCRATCH_MNT" ]; then
echo "common.config: Error: \$SCRATCH_MNT ($SCRATCH_MNT) is not a directory"
echo "common/config: Error: \$SCRATCH_MNT ($SCRATCH_MNT) is not a directory"
exit 1
fi
common/dump
+2 -2
View File
@@ -973,7 +973,7 @@ _parse_dump_args()
shift
;;
*)
_fail "invalid argument to common.dump function: $1"
_fail "invalid argument to common/dump function: $1"
;;
esac
shift
@@ -1018,7 +1018,7 @@ _parse_restore_args()
restore_args="$restore_args $1"
;;
*)
_fail "invalid argument to common.dump function: $1"
_fail "invalid argument to common/dump function: $1"
;;
esac
shift
common/filter.btrfs
+1 -1
View File
@@ -1,6 +1,6 @@
# Filters for btrfs command output
. ./common.filter.btrfs
. ./common/filter.btrfs
# Some, but not all, commands emit "Btrfs <version>"
_filter_btrfs_version()
common/rc
+6 -6
View File
@@ -151,12 +151,12 @@ _fsck_opts()
[ -z "$FSCK_OPTIONS" ] && _fsck_opts
# we need common.config
# we need common/config
if [ "$iam" != "check" ]
then
if ! . ./common/config
then
echo "$iam: failed to source common.config"
echo "$iam: failed to source common/config"
exit 1
fi
fi
@@ -2065,7 +2065,7 @@ then
if [ "$TEST_DEV" = "" ]
then
echo "common.rc: Error: \$TEST_DEV is not set"
echo "common/rc: Error: \$TEST_DEV is not set"
exit 1
fi
@@ -2075,11 +2075,11 @@ then
# $TEST_DEV is not mounted
if ! _test_mount
then
echo "common.rc: retrying test device mount with external set"
echo "common/rc: retrying test device mount with external set"
[ "$USE_EXTERNAL" != "yes" ] && export USE_EXTERNAL=yes
if ! _test_mount
then
echo "common.rc: could not mount $TEST_DEV on $TEST_DIR"
echo "common/rc: could not mount $TEST_DEV on $TEST_DIR"
exit 1
fi
fi
@@ -2087,7 +2087,7 @@ then
if [ "`_fs_type $TEST_DEV`" != "$FSTYP" ]
then
echo "common.rc: Error: \$TEST_DEV ($TEST_DEV) is not a MOUNTED $FSTYP filesystem"
echo "common/rc: Error: \$TEST_DEV ($TEST_DEV) is not a MOUNTED $FSTYP filesystem"
$DF_PROG $TEST_DEV
exit 1
fi