do qa testing on the new quota userspace.

diff --git a/common.quota b/common.quota
index 205ada158e0245a84efd81ebb94c50c3f376e14e..98a77d39053ede6883caf13873c300520e44a5c2 100644 (file)
--- a/common.quota
+++ b/common.quota
@@ -42,9 +42,9 @@ _require_quota()
     src/feature -q $TEST_DEV
     [ $? -ne 0 ] && _notrun "Installed kernel does not support XFS quota"
 
     src/feature -q $TEST_DEV
     [ $? -ne 0 ] && _notrun "Installed kernel does not support XFS quota"
 

-    [ ! -x /usr/sbin/repquota ] && _notrun "Quota user tools not installed"
+    [ ! -x /sbin/quotaon ] && _notrun "Quota user tools not installed"

 
 

-    /usr/sbin/repquota -m -s -a >/dev/null 2>&1
+    /sbin/quotaon -x 2>&1 | grep "option requires an argument -- x" >/dev/null

     [ $? -ne 0 ] && _notrun "Installed quota tools do not support XFS"
 }
 
     [ $? -ne 0 ] && _notrun "Installed quota tools do not support XFS"
 }
 

diff --git a/tools/auto-qa b/tools/auto-qa
index 89796d0dbe2bb28df3cb9fb5fd5c0b8622c88aa8..6d16ba894f9e4b50073dc7e1927f243243a068c9 100755 (executable)
--- a/tools/auto-qa
+++ b/tools/auto-qa
@@ -317,11 +317,6 @@ do
                         || _fail "            !!! clean $pkg failed"
             done
 
                         || _fail "            !!! clean $pkg failed"
             done
 

-            _log "        *** clean quota tools"
-            cd $WORKAREA/cmd/quota
-            ( rm -f configure ; autoconf ; sh configure ; make clean ) 2>&1 \
-                        || _fail "            !!! clean quota failed"
-

             _log "        *** clean linux"
             cd $WORKAREA/linux
             make mrproper 2>&1 \
             _log "        *** clean linux"
             cd $WORKAREA/linux
             make mrproper 2>&1 \


@@ -382,17 +377,6 @@ do
                         || _fail "            !!! install $pkg failed"
             done
 
                         || _fail "            !!! install $pkg failed"
             done
 

-            _log "        *** build and install quota tools"
-            cd $WORKAREA/cmd/quota
-            rm -f configure
-            
-            # use e-fence - but this will only take effect on configure
-            export MALLOCLIB=/usr/lib/libefence.a
-            ( autoconf ; sh configure --prefix=/usr; make all ) 2>&1 \
-                        || _fail "            !!! build quota failed"
-            _sudo make install 2>&1 \
-                        || _fail "            !!! install quota failed"
-

             new_state="install"
             ;;
             
             new_state="install"
             ;;