From: Eryu Guan Date: Fri, 29 Mar 2013 04:49:55 +0000 (+0000) Subject: xfstests: fix common source file path X-Git-Tag: v2022.05.01~3467 X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=8575764a791b83471f4588e12d5245651007bfc5 xfstests: fix common source file path 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 Reviewed-by: Rich Johnston Signed-off-by: Rich Johnston --- diff --git a/README b/README index 2d231de2..d4d4f313 100644 --- a/README +++ b/README @@ -65,7 +65,7 @@ Preparing system for tests (IRIX and Linux): environment variable set to "yes" will enable their use. - setenv DIFF_LENGTH "number of diff lines to print from a failed test", by default 10, set to 0 to print the full diff - - or add a case to the switch in common.config assigning + - or add a case to the switch in common/config assigning these variables based on the hostname of your test machine - or add these variables to a file called local.config and keep that @@ -113,7 +113,7 @@ Test script environment: When developing a new test script keep the following things in mind. All of the environment variables and shell procedures are - available to the script once the "common.rc" file has been + available to the script once the "common/rc" file has been sourced. 1. The tests are run from an arbitrary directory. If you want to @@ -166,7 +166,7 @@ Test script environment: _within_tolerance - fancy numerical "close enough is good enough" filter for deterministic output ... see comments in - common.filter for an explanation + common/filter for an explanation _filter_date - turn ctime(3) format dates into the string DATE for deterministic diff --git a/check b/check index 3b484028..966fbe55 100755 --- a/check +++ b/check @@ -50,7 +50,7 @@ timestamp=${TIMESTAMP:=false} rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out $tmp.xlist -# we need common.config +# we need common/config if ! . ./common/config then echo "$iam: failed to source common/config" diff --git a/common/config b/common/config index 7a95adce..bf629961 100644 --- a/common/config +++ b/common/config @@ -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 diff --git a/common/dump b/common/dump index 5d4d2aea..73d0304c 100644 --- a/common/dump +++ b/common/dump @@ -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 diff --git a/common/filter.btrfs b/common/filter.btrfs index 4aaaa9b1..b1aa733f 100644 --- a/common/filter.btrfs +++ b/common/filter.btrfs @@ -1,6 +1,6 @@ # Filters for btrfs command output -. ./common.filter.btrfs +. ./common/filter.btrfs # Some, but not all, commands emit "Btrfs " _filter_btrfs_version() diff --git a/common/rc b/common/rc index 5145cb64..09fb83f1 100644 --- a/common/rc +++ b/common/rc @@ -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 diff --git a/new b/new index 94638f69..d9c38c82 100755 --- a/new +++ b/new @@ -23,7 +23,7 @@ # generic initialization iam=new -. ./common.rc +. ./common/rc trap "rm -f /tmp/$$.; exit" 0 1 2 3 15 @@ -121,8 +121,8 @@ _cleanup() } # get standard environment, filters and checks -. ./common.rc -. ./common.filter +. ./common/rc +. ./common/filter # real QA test starts here diff --git a/setup b/setup index 52259516..eb7bdb33 100755 --- a/setup +++ b/setup @@ -15,9 +15,9 @@ # along with this program; if not, write the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -if ! . ./common.config +if ! . ./common/config then - echo "check: failed to source common.config" + echo "check: failed to source common/config" exit 1 fi diff --git a/soak b/soak index 0cf27a70..7e9eea06 100755 --- a/soak +++ b/soak @@ -19,8 +19,8 @@ # # get standard environment, filters and checks -. ./common.rc -. ./common.filter +. ./common/rc +. ./common/filter tmp=/tmp/$$ seq=soak diff --git a/tools/README.auto-qa b/tools/README.auto-qa index 82a873e3..0380b3f3 100644 --- a/tools/README.auto-qa +++ b/tools/README.auto-qa @@ -4,7 +4,7 @@ ______________________ ______________ - pick/create a user to run auto-qa and check they can use ptools to check out of the tree - - add your host to xfstests/common.config and check this file in + - add your host to xfstests/common/config and check this file in OR create a local.config file in your xfstests directory - make a directory "$HOME/qa" - make a kernel workarea "$HOME/qa/2.4.x-xfs" for 2.4.x-xfs diff --git a/tools/auto-qa b/tools/auto-qa index 4025e788..8d8f5ef9 100755 --- a/tools/auto-qa +++ b/tools/auto-qa @@ -86,7 +86,7 @@ STATE=$ROOT/qa.state QADIR="$WORKAREA/xfstests" SUDO="su -c" CONFIG="$ROOT/$HOST.config" -COMMON_CONFIG="$QADIR/common.config" +COMMON_CONFIG="$QADIR/common/config" SH="/bin/sh" LOG="$ROOT/qa.log"