diff options
author | Jan Kara <jack@suse.cz> | 2018-05-29 18:51:19 +0200 |
---|---|---|
committer | Eryu Guan <guaneryu@gmail.com> | 2018-06-03 22:16:15 +0800 |
commit | 141bd37a36857984bb80f8534810951002dcdf13 (patch) | |
tree | 13c28fc03fc91b3d012a28a82df171e0cf23c875 | |
parent | c4f104cdf420075674bdbedf190f052571af9c20 (diff) | |
download | xfstests-dev-141bd37a36857984bb80f8534810951002dcdf13.tar.gz |
fstests: Make ./new work for non-root user
Currently 'new' script sources common/config which tries to find
mkfs and fails if not found (which is likely for non-root user).
This is inconvenient as development usually does not happen as root.
In fact the vast majority of setup in common/config and common/rc is
not necessary for 'new'. Split out the necessary bits into new
common/test_names and use it in 'new'. Cleanup common/rc and
common/config now that they're only used from 'check' and 'setup'.
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
-rwxr-xr-x | check | 15 | ||||
-rw-r--r-- | common/config | 7 | ||||
-rw-r--r-- | common/rc | 27 | ||||
-rw-r--r-- | common/test_names | 12 | ||||
-rwxr-xr-x | new | 5 |
5 files changed, 24 insertions, 42 deletions
@@ -331,10 +331,10 @@ while [ $# -gt 0 ]; do shift done -# we need common/config, source it after processing args, overlay needs FSTYP -# set before sourcing common/config -if ! . ./common/config; then - echo "$iam: failed to source common/config" +# we need common/rc, that also sources common/config. We need to source it +# after processing args, overlay needs FSTYP set before sourcing common/config +if ! . ./common/rc; then + echo "check: failed to source common/rc" exit 1 fi @@ -374,13 +374,6 @@ elif [ -z "$GROUP_LIST" ]; then GROUP_LIST="auto" fi -# we need common/rc -if ! . ./common/rc -then - echo "check: failed to source common/rc" - exit 1 -fi - if [ `id -u` -ne 0 ] then echo "check: QA must be run as root" diff --git a/common/config b/common/config index e1cd8fad4a..4807e6cd78 100644 --- a/common/config +++ b/common/config @@ -47,6 +47,8 @@ # validity or mountedness. # +. common/test_names + # all tests should use a common language setting to prevent golden # output mismatches. export LANG=C @@ -269,11 +271,6 @@ fi rm -f /tmp/crc_check.img export XFS_MKFS_HAS_NO_META_SUPPORT -# new doesn't need config file parsed, we can stop here -if [ "$iam" == "new" ]; then - return 0 -fi - _mount_opts() { case $FSTYP in @@ -20,18 +20,9 @@ # Mountain View, CA 94043, USA, or: http://www.sgi.com #----------------------------------------------------------------------- -BC=$(which bc 2> /dev/null) || BC= +. common/config -# Valid test names start with 3 digits "NNN": -# "[0-9]\{3\}" -# followed by an optional "-": -# "-\?" -# followed by an optional combination of alphanumeric and "-" chars: -# "[[:alnum:]-]*" -# e.g. 999-the-mark-of-fstests -# -VALID_TEST_ID="[0-9]\{3\}" -VALID_TEST_NAME="$VALID_TEST_ID-\?[[:alnum:]-]*" +BC=$(which bc 2> /dev/null) || BC= # Some tests are not relevant or functional when testing XFS realtime # subvolumes along with the rtinherit=1 mkfs option. In these cases, @@ -110,16 +101,6 @@ _ls_l() ls -l $* | sed "s/\(^[-rwxdlbcpsStT]*\)\. /\1 /" | grep -v 'lost+found' } -# we need common/config -if [ "$iam" != "check" ] -then - if ! . ./common/config - then - echo "$iam: failed to source common/config" - exit 1 - fi -fi - _dump_err() { _err_msg="$*" @@ -3574,10 +3555,6 @@ _disable_dmesg_check() init_rc() { - if [ "$iam" == new ] - then - return - fi # make some further configuration checks here if [ "$TEST_DEV" = "" ] then diff --git a/common/test_names b/common/test_names new file mode 100644 index 0000000000..98af40cdbd --- /dev/null +++ b/common/test_names @@ -0,0 +1,12 @@ +##/bin/bash + +# Valid test names start with 3 digits "NNN": +# "[0-9]\{3\}" +# followed by an optional "-": +# "-\?" +# followed by an optional combination of alphanumeric and "-" chars: +# "[[:alnum:]-]*" +# e.g. 999-the-mark-of-fstests +# +VALID_TEST_ID="[0-9]\{3\}" +VALID_TEST_NAME="$VALID_TEST_ID-\?[[:alnum:]-]*" @@ -23,7 +23,7 @@ # generic initialization iam=new -. ./common/rc +. ./common/test_names trap "rm -f /tmp/$$.; exit" 0 1 2 3 15 @@ -81,6 +81,9 @@ line=0 eof=1 [ -f "$tdir/group" ] || usage +export AWK_PROG="$(type -P awk)" +[ "$AWK_PROG" = "" ] && { echo "awk not found"; exit; } + for found in `cat $tdir/group | tr - ' ' | $AWK_PROG '{ print $1 }'` do line=$((line+1)) |