generic: test MADV_POPULATE_READ with IO errors

[xfstests-dev.git] / new

diff --git a/new b/new
index 07144399d8788de533de732fb38911c47340d26b..9651e0e0b748eb8a6ed76c3d7d2e0fc1634edc35 100755 (executable)
--- a/new
+++ b/new
@@ -20,13 +20,24 @@ _cleanup()
 SRC_GROUPS=`find tests -not -path tests -type d -printf "%f "`
 usage()
 {
-    echo "Usage $0 test_dir"
+    echo "Usage $0 test_dir|test_dir_and_name"
     echo "Available dirs are: $SRC_GROUPS"
     exit
 }
 
 [ $# -eq 0 ] && usage
-tdir=tests/$1
+
+if echo "$1" | grep -q '/'; then
+       if [ -e "tests/$1" ]; then
+               echo "$1: test already exists."
+               exit 1
+       fi
+       tdir="tests/$(echo "$1" | cut -d '/' -f 1)"
+       id="$(echo "$1" | cut -d '/' -f 2)"
+else
+       tdir=tests/$1
+       id="$(basename "$(./tools/nextid "$1")")"
+fi
 
 i=0
 line=0
@@ -36,7 +47,6 @@ eof=1
 export AWK_PROG="$(type -P awk)"
 [ "$AWK_PROG" = "" ] && { echo "awk not found"; exit; }
 
-id="$(basename "$(./tools/nextid "$1")")"
 echo "Next test id is $id"
 shift
 
@@ -73,51 +83,57 @@ then
     exit 1
 fi
 
-if [ $# -eq 0 ]
-then
+# Extract group names from the documentation.
+group_names() {
+       awk '/^[[:lower:][:digit:]_]/ {
+               if ($1 != "" && $1 != "Group" && $2 != "Name:" && $1 != "all")
+                       printf("%s\n", $1);
+       }' doc/group-names.txt
+}
 
-    while true
-    do
-       echo -n "Add to group(s) [other] (separate by space, ? for list): "
-       read ans
-       [ -z "$ans" ] && ans=other
-       if [ "X$ans" = "X?" ]
-       then
-           for d in $SRC_GROUPS; do
-               (cd "tests/$d/" ; ../../tools/mkgroupfile "$tmpfile")
-               l=$(sed -n < "$tmpfile" \
-                   -e 's/#.*//' \
-                   -e 's/$/ /' \
-                   -e 's;\(^[0-9][0-9][0-9]\)\(.*$\);\2;p')
-               grpl="$grpl $l"
-           done
-           lst=`for word in $grpl; do echo $word; done | sort| uniq `
-           echo $lst
-       else
-           # only allow lower cases, spaces, digits and underscore in group
-           inval=`echo $ans | tr -d '[:lower:][:space:][:digit:]_'`
-           if [ "$inval" != "" ]; then
-               echo "Invalid characters in group(s): $inval"
-               echo "Only lower cases, digits and underscore are allowed in groups, separated by space"
-               continue
-           else
-               # remove redundant spaces/tabs
-               ans=`echo "$ans" | sed 's/\s\+/ /g'`
-               break
-           fi
-       fi
-    done
+# Make sure that the new test's groups fit the correct format and are listed
+# in the group documentation file.
+check_groups() {
+       for g in "$@"; do
+               local inval="$(echo "${g}" | tr -d '[:lower:][:space:][:digit:]_')"
+               if [ -n "${inval}" ]; then
+                       echo "Invalid characters in group(s): ${inval}"
+                       echo "Only lower cases, digits and underscore are allowed in groups, separated by space"
+                       return 1
+               elif [ "${g}" = "other" ]; then
+                       echo "Do not add more tests to group \"other\""
+                       return 1
+               elif ! group_names | grep -q -w "${g}"; then
+                       echo "Warning: group \"${g}\" not defined in documentation"
+                       return 1
+               fi
+       done
+
+       return 0
+}
+
+if [ $# -eq 0 ]; then
+       # interactive mode
+       prompt="Add to group(s) [auto] (separate by space, ? for list): "
+       while true; do
+               read -p "${prompt}" -a new_groups || exit 1
+               case "${#new_groups[@]}" in
+               0)
+                       new_groups=("auto")
+                       ;;
+               1)
+                       if [ "${new_groups[0]}" = "?" ]; then
+                               echo $(group_names | grep -v -w 'other')
+                               continue
+                       fi
+                       ;;
+               esac
+               check_groups "${new_groups[@]}" && break
+       done
 else
-    # expert mode, groups are on the command line
-    #
-    (cd "$tdir" ; ../../tools/mkgroupfile "$tmpfile")
-    for g in $*
-    do
-       if ! grep -q "[[:space:]]$g" "$tmpfile"; then
-           echo "Warning: group \"$g\" not defined in $tdir tests"
-       fi
-    done
-    ans="$*"
+       # expert mode, groups are on the command line
+       new_groups=("$@")
+       check_groups "${new_groups[@]}" || exit 1
 fi
 
 echo -n "Creating skeletal script for you to edit ..."
@@ -134,7 +150,7 @@ cat <<End-of-File >$tdir/$id
 # what am I here for?
 #
 . ./common/preamble
-_begin_fstest $ans
+_begin_fstest ${new_groups[@]}
 
 # Override the default cleanup function.
 # _cleanup()