tidy mkfs parameterisation, -f option pulled into common.rc.

[xfstests-dev.git] / tools / auto-qa

diff --git a/tools/auto-qa b/tools/auto-qa
index 2db90e1cdc5d6097918545bc0e67a8614e23a70c..79a00a7c955328ff063978ac2f744f9c9ca5da4d 100755 (executable)
--- a/tools/auto-qa
+++ b/tools/auto-qa
@@ -40,7 +40,8 @@ BOOT="/boot"
 SOAK_PASSES="-1"
 SOAK_STRESS="10000"
 SOAK_PROC="3"
-
+export MKFS_OPTIONS=${MKFS_OPTIONS:=-bsize=4096}
+export MOUNT_OPTIONS=${MOUNT_OPTIONS:=-ologbufs=2}
 
 _log()
 {
@@ -115,30 +116,25 @@ LOG="$ROOT/qa.log"
 
 case $HOST
 in
-    fuzzy)
+    bruce)
         EMAIL="nathans@larry"
         ADMINEMAIL="nathans@larry"
-        MODULAR=1
-        ;;
-    bruce)
-        EMAIL="dxm@larry"
-        ADMINEMAIL="dxm@larry"
-        MODULAR=1
+        MODULAR=0
         ;;
     sagan)
-        EMAIL="dxm@larry"
-        ADMINEMAIL="dxm@larry"
-        MODULAR=0
+        EMAIL="tes@larry"
+        ADMINEMAIL="tes@larry"
+        MODULAR=1
         ;;
     troppo)
-       EMAIL="nathans@larry"
-       ADMINEMAIL="nathans@larry"
+       EMAIL="kaos@larry"
+       ADMINEMAIL="kaos@larry"
        MODULAR=0
        ;;
-    goldfish)
+    frodo)
        EMAIL="nathans@larry"
        ADMINEMAIL="nathans@larry"
-       MODULAR=1
+       MODULAR=0
        ;;
     *)
         _fail "auto-qa: no configuration information for host '$HOST'"
@@ -209,8 +205,7 @@ _sudo()
 
 _restart()
 {
-    # erk - why won't this thing reboot reliably??
-    exec $ROOT/su -c "(shutdown -r 2 \"auto-qa rebooting\" ; sleep 10 ; reboot ; sleep 10 ; reboot )&" < /dev/null
+    exec $ROOT/su -c "(shutdown -r 1 \"auto-qa rebooting\" )&" < /dev/null
 }
 
 _update_autoqa_file()
@@ -399,6 +394,11 @@ do
 
                 _sudo make install install-dev 2>&1 \
                         || _fail "            !!! install $pkg failed"
+
+               # attr and acl now have install-lib targets as well
+               [ $pkg == "attr" -o $pkg == "acl" ] || continue
+               _sudo make install-lib 2>&1 \
+                       || _fail "            !!! install $pkg failed"
             done
 
             new_state="install"
@@ -499,7 +499,7 @@ do
             
             _log "            *** clean TEST_DEV"
             
-            _sudo mkfs -t xfs -f $TEST_DEV 2>&1 \
+            _sudo mkfs -t xfs -f $MKFS_OPTIONS $TEST_DEV 2>&1 \
                         || _fail "            !!! failed to mkfs TEST_DEV"
             
             _log "            *** mounting TEST_DEV"