interrupt=true
diff="diff -u"
showme=false
-expunge=true
have_test_arg=false
randomize=false
here=`pwd`
FSTYP=xfs
+xfile=""
-SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
-
-# generic initialization
+# start the initialisation work now
iam=check
+export MSGVERB="text:action"
export QA_CHECK_FS=${QA_CHECK_FS:=true}
-# by default don't output timestamps
-timestamp=${TIMESTAMP:=false}
-
# number of diff lines from a failed test, 0 for whole output
export DIFF_LENGTH=${DIFF_LENGTH:=10}
# by default don't output timestamps
timestamp=${TIMESTAMP:=false}
+rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out $tmp.xlist
+
+# we need common/config
+if ! . ./common/config
+then
+ echo "$iam: failed to source common/config"
+ exit 1
+fi
+
+# Autodetect fs type based on what's on $TEST_DEV
+if [ "$HOSTOS" == "Linux" ]; then
+ FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
+fi
+export FSTYP
+
+SUPPORTED_TESTS="[0-9][0-9][0-9] [0-9][0-9][0-9][0-9]"
+SRC_GROUPS="generic shared"
+export SRC_DIR="tests"
+export RESULT_BASE=${RESULT_BASE:="$here/results"}
+
usage()
{
echo "Usage: $0 [options] [testlist]"'
testlist options
-g group[,group...] include tests from these groups
-x group[,group...] exclude tests from these groups
- NNN include test NNN
- NNN-NNN include test range (eg. 012-021)
+ -X file exclude individual tests
+ [testlist] include tests matching names in testlist
'
exit 0
}
-_setenvironment()
-{
- MSGVERB="text:action"
- export MSGVERB
-}
-
get_group_list()
{
grp=$1
- grpl=$(sed -n < group \
- -e 's/#.*//' \
- -e 's/$/ /' \
- -e "/^[0-9][0-9][0-9].* $grp /"'{ s/ .*//p }')
+ for d in $SRC_GROUPS $FSTYP; do
+ l=$(sed -n < $SRC_DIR/$d/group \
+ -e 's/#.*//' \
+ -e 's/$/ /' \
+ -e "s;\(^[0-9][0-9][0-9]\).* $grp .*;$SRC_DIR/$d/\1;p")
+ grpl="$grpl $l"
+ done
echo $grpl
}
-expand_test_numbers()
+# find all tests, excluding files that are test metadata such as group files.
+# This assumes that tests are defined purely by alphanumeric filenames with no
+# ".xyz" extensions in the name.
+get_all_tests()
+{
+ touch $tmp.list
+ for d in $SRC_GROUPS $FSTYP; do
+ ls $SRC_DIR/$d/* | \
+ grep -v "\..*" | \
+ grep -v group >> $tmp.list 2>/dev/null
+ done
+}
+
+# takes the list of tests to run in $tmp.list, and removes the tests passed to
+# the function from that list.
+trim_test_list()
{
- # strip leading zeros, could be considered octal.
- start=`echo $1 | sed 's/^0*//'`
- end=`echo $2 | sed 's/^0*//'`
+ test_list="$*"
- $AWK_PROG </dev/null '
-BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
- | while read id
+ rm -f $tmp.grep
+ numsed=0
+ for t in $test_list
do
- if grep -s "^$id " group >/dev/null ; then
- # in group file ... OK
- echo $id >>$tmp.list
- elif [ -f expunged ] && $expunge && \
- egrep "^$id([ ]|\$)" expunged >/dev/null ; then
- # expunged ... will be reported, but not run, later
- echo $id >>$tmp.list
- else
- # oops
- echo "$id - unknown test, ignored"
- fi
+ if [ $numsed -gt 100 ]; then
+ grep -v -f $tmp.grep <$tmp.list >$tmp.tmp
+ mv $tmp.tmp $tmp.list
+ numsed=0
+ rm -f $tmp.grep
+ fi
+ echo "^$t\$" >>$tmp.grep
+ numsed=`expr $numsed + 1`
done
+ grep -v -f $tmp.grep <$tmp.list >$tmp.tmp
+ mv $tmp.tmp $tmp.list
}
+
_wallclock()
{
date "+%H %M %S" | $AWK_PROG '{ print $1*3600 + $2*60 + $3 }'
echo -n " [$now]"
}
-# start the initialisation work now
-_setenvironment
-
-rm -f $tmp.list $tmp.tmp $tmp.sed $here/$iam.out
-
-# Autodetect fs type based on what's on $TEST_DEV
-if [ "$HOSTOS" == "Linux" ]; then
- FSTYP=`blkid -c /dev/null -s TYPE -o value $TEST_DEV`
-fi
-export FSTYP
-
-# we need common.config
-if ! . ./common.config
-then
- echo "$iam: failed to source common.config"
- exit 1
-fi
-
+# Process command arguments first.
while [ $# -gt 0 ]; do
case "$1" in
-\? | -h | --help) usage ;;
;;
-x) xgroup=$2 ; shift ;
- [ ! -s $tmp.list ] && ls $SUPPORTED_TESTS >$tmp.list 2>/dev/null
+
+ # Note: behaviour is dependent on command line ordering of
+ # -g and -x parameters. If there are no preceding -g commands,
+ # this works on all tests, otherwise just the tests specified by
+ # the early -g inclusions.
+ [ ! -s $tmp.list ] && get_all_tests
+
group_list=$(get_group_list $xgroup)
if [ -z "$group_list" ]; then
echo "Group \"$xgroup\" is empty or not defined?"
exit 1
fi
- rm -f $tmp.sed
- numsed=0
- for t in $group_list
- do
- if [ $numsed -gt 100 ]; then
- sed -f $tmp.sed <$tmp.list >$tmp.tmp
- mv $tmp.tmp $tmp.list
- numsed=0
- rm -f $tmp.sed
- fi
- echo "/^$t\$/d" >>$tmp.sed
- numsed=`expr $numsed + 1`
+ trim_test_list $group_list
+ ;;
+
+ -X) xfile=$2; shift ;
+ for d in $SRC_GROUPS $FSTYP; do
+ [ -f $SRC_DIR/$d/$xfile ] || continue
+ for f in `cat $SRC_DIR/$d/$xfile`; do
+ echo $d/$f >> $tmp.xlist
+ done
done
- sed -f $tmp.sed <$tmp.list >$tmp.tmp
- mv $tmp.tmp $tmp.list
;;
-l) diff="diff" ;;
-T) timestamp=true ;;
- "$SUPPORTED_TESTS")
- echo "No tests?"
- status=1
- exit $status
- ;;
-
- [0-9]*-[0-9]*)
- eval `echo $1 | sed -e 's/^/start=/' -e 's/-/ end=/'`
- expand_test_numbers $start $end
- have_test_arg=true
- ;;
-
- [0-9]*-)
- eval `echo $1 | sed -e 's/^/start=/' -e 's/-//'`
- end=`echo $SUPPORTED_TESTS | sed -e 's/\[0-9]//g' -e 's/ *$//' -e 's/.* //'`
- if [ -z "$end" ]; then
- echo "No tests in range \"$1\"?"
- status=1
- exit $status
- fi
- expand_test_numbers $start $end
- have_test_arg=true
- ;;
-
--large-fs) export LARGE_SCRATCH_DEV=yes ;;
--extra-space=*) export SCRATCH_DEV_EMPTY_SPACE=${r#*=} ;;
-*) usage ;;
- *) expand_test_numbers $1 $1 ;
- have_test_arg=true
- ;;
+ *) # not an argument, we've got tests now.
+ have_test_arg=true ;;
esac
+ # if we've found a test specification, the break out of the processing
+ # loop before we shift the arguments so that this is the first argument
+ # that we process in the test arg loop below.
+ if $have_test_arg; then
+ break;
+ fi
+
shift
done
+# Process tests from command line now.
+if $have_test_arg; then
+ while [ $# -gt 0 ]; do
+ case "$1" in
+ -*) echo "Argments before tests, please!"
+ status=1
+ exit $status
+ ;;
+ *) test_dir=`dirname $1`
+ test_name=`basename $1`
+ group_file=$SRC_DIR/$test_dir/group
+
+ if grep "^$testname" $group_file >/dev/null ; then
+ # in group file ... OK
+ echo $SRC_DIR/$1 >>$tmp.list
+ else
+ # oops
+ echo "$1 - unknown test, ignored"
+ fi
+ ;;
+ esac
+
+ shift
+ done
+fi
+
if [ -s $tmp.list ]; then
# found some valid test numbers ... this is good
:
# sort the list of tests into numeric order
list=`sort -n $tmp.list`
-rm -f $tmp.list $tmp.tmp $tmp.sed
+rm -f $tmp.list $tmp.tmp $tmp.grep
if $randomize
then
list=`echo $list | awk -f randomize.awk`
fi
-# we need common.rc
-if ! . ./common.rc
+# we need common/rc
+if ! . ./common/rc
then
- echo "check: failed to source common.rc"
+ echo "check: failed to source common/rc"
exit 1
fi
_wrapup()
{
- # for hangcheck ...
- # remove files that were used by hangcheck
- #
- [ -f /tmp/check.pid ] && rm -rf /tmp/check.pid
- [ -f /tmp/check.sts ] && rm -rf /tmp/check.sts
-
if $showme
then
:
mv $tmp.out check.time
fi
- if [ -f $tmp.expunged ]
- then
- notrun=`wc -l <$tmp.expunged | sed -e 's/ *//g'`
- n_try=`expr $n_try - $notrun`
- list=`echo "$list" | sed -f $tmp.expunged`
- fi
-
echo "" >>check.log
date >>check.log
- echo $list | fmt | sed -e 's/^/ /' >>check.log
+ echo $list | fmt | sed -e 's/^/ /' -e "s;$SRC_DIR/;;g" >>check.log
$interrupt && echo "Interrupted!" >>check.log
if [ ! -z "$n_try" -a $n_try != 0 ]
fi
rm -f /tmp/*.rawout /tmp/*.out /tmp/*.err /tmp/*.time
- rm -f /tmp/check.pid /tmp/check.sts
rm -f $tmp.*
}
trap "_wrapup; exit \$status" 0 1 2 3 15
-# for hangcheck ...
-# Save pid of check in a well known place, so that hangcheck can be sure it
-# has the right pid (getting the pid from ps output is not reliable enough).
-#
-rm -rf /tmp/check.pid
-echo $$ >/tmp/check.pid
-
-# for hangcheck ...
-# Save the status of check in a well known place, so that hangcheck can be
-# sure to know where check is up to (getting test number from ps output is
-# not reliable enough since the trace stuff has been introduced).
-#
-rm -rf /tmp/check.sts
-echo "preamble" >/tmp/check.sts
-
# don't leave old full output behind on a clean run
rm -f check.full
fi
fi
+mkdir -p $RESULT_BASE
+if [ ! -d $RESULT_BASE ]; then
+ echo "failed to create results directory $RESULTS_BASE"
+ exit 1;
+fi
+
seq="check"
_check_test_fs
-[ -n "$TESTS_REMAINING_LOG" ] && echo $list > $TESTS_REMAINING_LOG
-
for seq in $list
do
err=false
- echo -n "$seq"
- if [ -n "$TESTS_REMAINING_LOG" ] ; then
- sed -e "s/$seq//" -e 's/ / /' -e 's/^ *//' $TESTS_REMAINING_LOG > $TESTS_REMAINING_LOG.tmp
- mv $TESTS_REMAINING_LOG.tmp $TESTS_REMAINING_LOG
- sync
- fi
+
+ # the filename for the test and the name output are different.
+ # we don't include the tests/ directory in the name output.
+ seqnum=`echo $seq | sed -e "s;$SRC_DIR/;;"`
+
+ # Similarly, the result directory needs to replace the tests/
+ # part of the test location.
+ group=`dirname $seq`
+ export RESULT_DIR=`echo $group | sed -e "s;$SRC_DIR;$RESULT_BASE;"`
+ mkdir -p $RESULT_DIR
+ seqres="$RESULT_BASE/$seqnum"
+
+ echo -n "$seqnum"
if $showme
then
echo
continue
- elif [ -f expunged ] && $expunge && egrep "^$seq([ ]|\$)" expunged >/dev/null
- then
- echo " - expunged"
- rm -f $seq.out.bad
- echo "/^$seq\$/d" >>$tmp.expunged
elif [ ! -f $seq ]
then
echo " - no such test?"
- echo "/^$seq\$/d" >>$tmp.expunged
else
# really going to try and run this one
#
- rm -f $seq.out.bad
- lasttime=`sed -n -e "/^$seq /s/.* //p" <check.time`
+ rm -f $seqres.out.bad
+
+ # check if we really should run it
+ if [ -s $tmp.xlist ]; then
+ if grep $seqnum $tmp.xlist > /dev/null 2>&1 ; then
+ echo " [expunged]"
+ continue
+ fi
+ fi
+
+ # slashes now in names, sed barfs on them so use grep
+ lasttime=`grep -w ^$seq check.time | awk '// {print $2}'`
if [ "X$lasttime" != X ]; then
echo -n " ${lasttime}s ..."
else
echo -n " " # prettier output with timestamps.
fi
- rm -f core $seq.notrun
-
- # for hangcheck ...
- echo "$seq" >/tmp/check.sts
+ rm -f core $seqres.notrun
start=`_wallclock`
$timestamp && echo -n " ["`date "+%T"`"]"
[ ! -x $seq ] && chmod u+x $seq # ensure we can run it
- $LOGGER_PROG "run xfstest $seq"
+ $LOGGER_PROG "run xfstest $seqnum"
./$seq >$tmp.rawout 2>&1
sts=$?
$timestamp && _timestamp
if [ -f core ]
then
echo -n " [dumped core]"
- mv core $seq.core
+ mv core $RESULT_BASE/$seqnum.core
err=true
fi
- if [ -f $seq.notrun ]
+ if [ -f $seqres.notrun ]
then
$timestamp || echo -n " [not run] "
- $timestamp && echo " [not run]" && echo -n " $seq -- "
- cat $seq.notrun
- notrun="$notrun $seq"
+ $timestamp && echo " [not run]" && echo -n " $seqnum -- "
+ cat $seqres.notrun
+ notrun="$notrun $seqnum"
else
if [ $sts -ne 0 ]
then
then
:
else
- echo "$seq `expr $stop - $start`" >>$tmp.time
+ echo "$seqnum `expr $stop - $start`" >>$tmp.time
echo -n " `expr $stop - $start`s"
fi
echo ""
else
- echo " - output mismatch (see $seq.out.bad)"
- mv $tmp.out $seq.out.bad
- $diff $seq.out $seq.out.bad | {
+ echo " - output mismatch (see $seqres.out.bad)"
+ mv $tmp.out $seqres.out.bad
+ $diff $seq.out $seqres.out.bad | {
if test "$DIFF_LENGTH" -le 0; then
cat
else
fi; } | \
sed -e 's/^\(.\)/ \1/'
echo " ..."
- echo " (Run '$diff $seq.out $seq.out.bad' to see the" \
+ echo " (Run '$diff $seq.out $seqres.out.bad' to see the" \
"entire diff)"
err=true
fi
#
if $err
then
- bad="$bad $seq"
+ bad="$bad $seqnum"
n_bad=`expr $n_bad + 1`
quick=false
fi
- if [ ! -f $seq.notrun ]
+ if [ ! -f $seqres.notrun ]
then
- try="$try $seq"
+ try="$try $seqnum"
n_try=`expr $n_try + 1`
_check_test_fs
fi
-
- seq="after_$seq"
+
+ seq="after_$seqnum"
done
interrupt=false