xfstests: fix common source file path
[xfstests-dev.git] / check
diff --git a/check b/check
index 5768be68fb6f8f720815a9d8f81a5dc1af99183b..966fbe556b6a6225c38ee3c2619e54034a501000 100755 (executable)
--- a/check
+++ b/check
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Control script for QA
 #
@@ -28,38 +28,120 @@ n_bad=0
 bad=""
 notrun=""
 interrupt=true
+diff="diff -u"
+showme=false
+have_test_arg=false
+randomize=false
+here=`pwd`
+FSTYP=xfs
+xfile=""
+
+# start the initialisation work now
+iam=check
 
+export MSGVERB="text:action"
 export QA_CHECK_FS=${QA_CHECK_FS:=true}
 
+# 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}
 
-# generic initialization
-iam=check
+rm -f $tmp.list $tmp.tmp $tmp.grep $here/$iam.out $tmp.xlist
 
-# we need common.config
-if ! . ./common.config
+# we need common/config
+if ! . ./common/config
 then
-    echo "$iam: failed to source common.config"
+    echo "$iam: failed to source common/config"
     exit 1
 fi
 
-# we need common
-. ./common
+# 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"}
 
-# we need common.rc
-if ! . ./common.rc
-then
-    echo "check: failed to source common.rc"
-    exit 1
-fi
+usage()
+{
+    echo "Usage: $0 [options] [testlist]"'
+
+check options
+    -xfs                test XFS (default)
+    -udf                test UDF
+    -nfs                test NFS
+    -l                 line mode diff
+    -udiff             show unified diff (default)
+    -n                 show me, do not run tests
+    -T                 output timestamps
+    -r                 randomize test order
+    --large-fs         optimise scratch device for large filesystems
+
+testlist options
+    -g group[,group...]        include tests from these groups
+    -x group[,group...]        exclude tests from these groups
+    -X file            exclude individual tests
+    [testlist]         include tests matching names in testlist
+'
+           exit 0
+}
+
+get_group_list()
+{
+       grp=$1
+
+       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
+}
+
+# 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()
+{
+       test_list="$*"
+
+       rm -f $tmp.grep
+       numsed=0
+       for t in $test_list
+       do
+           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
+}
 
-if [ `id -u` -ne 0 ]
-then
-    echo "check: QA must be run as root"
-    exit 1
-fi
 
 _wallclock()
 {
@@ -72,14 +154,145 @@ _timestamp()
     echo -n " [$now]"
 }
 
+# Process command arguments first.
+while [ $# -gt 0 ]; do
+       case "$1" in
+       -\? | -h | --help) usage ;;
+
+       -udf)   FSTYP=udf ;;
+       -xfs)   FSTYP=xfs ;;
+       -nfs)   FSTYP=nfs ;;
+
+       -g)     group=$2 ; shift ;
+               group_list=$(get_group_list $group)
+               if [ -z "$group_list" ]; then
+                   echo "Group \"$group\" is empty or not defined?"
+                   exit 1
+               fi
+
+               [ ! -s $tmp.list ] && touch $tmp.list
+               for t in $group_list; do
+                       grep -s "^$t\$" $tmp.list >/dev/null || \
+                                                       echo "$t" >>$tmp.list
+               done
+
+               ;;
+
+       -x)     xgroup=$2 ; shift ;
+
+               # 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
+
+               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
+               ;;
+
+       -l)     diff="diff" ;;
+       -udiff) diff="$diff -u" ;;
+
+       -n)     showme=true ;;
+        -r)    randomize=true ;;
+
+       -T)     timestamp=true ;;
+
+       --large-fs) export LARGE_SCRATCH_DEV=yes ;;
+       --extra-space=*) export SCRATCH_DEV_EMPTY_SPACE=${r#*=} ;;
+
+       -*)     usage ;;
+       *)      # 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
+    :
+elif $have_test_arg; then
+       # had test numbers, but none in group file ... do nothing
+       touch $tmp.list
+else
+       # no test numbers, do everything from group file
+       sed -n -e '/^[0-9][0-9][0-9]*/s/[       ].*//p' <group >$tmp.list
+fi
+
+# sort the list of tests into numeric order
+list=`sort -n $tmp.list`
+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
+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"
+    exit 1
+fi
+
+# Ok, time to start running...
+
 _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
        :
@@ -98,16 +311,9 @@ END { if (NR > 0) {
            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 ]
@@ -135,27 +341,11 @@ END       { if (NR > 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
 
@@ -195,52 +385,65 @@ if [ ! -z "$SCRATCH_DEV" ]; then
   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 $seqnum"
        ./$seq >$tmp.rawout 2>&1
        sts=$?
        $timestamp && _timestamp
@@ -252,16 +455,16 @@ do
        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
@@ -275,17 +478,27 @@ do
            else
                if diff $seq.out $tmp.out >/dev/null 2>&1
                then
-                   echo ""
                    if $err
                    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
+                               head -n "$DIFF_LENGTH"
+                       fi; } | \
+                       sed -e 's/^\(.\)/    \1/'
+                   echo "     ..."
+                   echo "     (Run '$diff $seq.out $seqres.out.bad' to see the" \
+                        "entire diff)"
                    err=true
                fi
            fi
@@ -297,18 +510,18 @@ do
     #
     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