build: AC_PACKAGE_WANT_GDBM, fall back to compat if libgdbm detection fails

[xfstests-dev.git] / new

diff --git a/new b/new
index d1f8939d963b3ca28bdcc089a0dc95b4bdf31cac..4eacccd3bf8b1fbac145c5e72a13b01077beeca0 100755 (executable)
--- a/new
+++ b/new
@@ -81,11 +81,14 @@ line=0
 eof=1
 [ -f "$tdir/group" ] || usage
 
-for found in `cat $tdir/group | $AWK_PROG '{ print $1 }'`
+for found in `cat $tdir/group | tr - ' ' | $AWK_PROG '{ print $1 }'`
 do
     line=$((line+1))
-    if [ -z "$found" ] || [ "$found" == "#" ];then
-       continue
+    if [ -z "$found" ] || [ "$found" == "#" ]; then
+        continue
+    elif ! echo "$found" | grep -q "^$VALID_TEST_NAME$"; then
+        # this one is for tests not named by a number
+        continue
     fi
     i=$((i+1))
     id=`printf "%03d" $i`
@@ -100,7 +103,48 @@ if [ $eof -eq 1 ]; then
    id=`printf "%03d" $i`
 fi
 
-echo "Next test is $id"
+echo "Next test id is $id"
+
+read -p "Append a name to the ID? Test name will be $id-\$name. y,[n]: " -r
+if [[ $REPLY = [Yy] ]]; then
+       # get the new name from user
+       name=""
+       while [ "$name" = "" ]; do
+               read -p "Enter the name: "
+               if [ "$REPLY" = "" ]; then
+                       echo "For canceling, use ctrl+c."
+               elif echo "$id-$REPLY" | grep -q "^$VALID_TEST_NAME$"; then
+                       if [ -e "$tdir/$id-$REPLY" ]; then
+                               echo "File '$id-$REPLY' already exists, use another one."
+                               echo
+                       else
+                               name="$REPLY"
+                       fi
+               else
+                       echo "A name can contain only alphanumeric symbols and dash!"
+                       echo
+               fi
+       done
+
+       # now find where to insert this name
+       eof=1
+       for found in `tail -n +$line $tdir/group | $AWK_PROG '{ print $1 }'`; do
+               found_id=$(echo "$found" | cut -d "-" -f 1 - )
+               line=$((line+1))
+               if [ -z "$found" ] || [ "$found" == "#" ]; then
+                       continue
+               elif [ $found_id -gt $id ]; then
+                       eof=0
+                       break
+               fi
+       done
+       if [ $eof -eq 0 ]; then
+               # If place wasn't found, let $line be the end of the file
+               line=$((line-1))
+       fi
+       id="$id-$name"
+fi
+echo "Creating test file '$id'"
 
 if [ -f $tdir/$id ]
 then
@@ -115,7 +159,7 @@ year=`date +%Y`
 
 cat <<End-of-File >$tdir/$id
 #! /bin/bash
-# FS QA Test No. $id
+# FS QA Test $id
 #
 # what am I here for?
 #
@@ -156,11 +200,14 @@ _cleanup()
 . ./common/rc
 . ./common/filter
 
+# remove previous \$seqres.full before test
+rm -f \$seqres.full
+
 # real QA test starts here
 
 # Modify as appropriate.
 _supported_fs generic
-_supported_os IRIX Linux
+_supported_os Linux
 _require_test
 
 # if error
@@ -181,12 +228,18 @@ echo ""
 chmod 755 $tdir/$id
 ${EDITOR-vi} $tdir/$id
 
+# Create default .out file
+cat <<End-of-File >$tdir/$id.out
+QA output created by $id
+Silence is golden
+End-of-File
+
 if [ $# -eq 0 ]
 then
 
     while true
     do
-       echo -n "Add to group(s) [other] (? for list): "
+       echo -n "Add to group(s) [other] (separate by space, ? for list): "
        read ans
        [ -z "$ans" ] && ans=other
        if [ "X$ans" = "X?" ]
@@ -201,7 +254,17 @@ then
            lst=`for word in $grpl; do echo $word; done | sort| uniq `
            echo $lst
        else
-           break
+           # 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
 else