fix references to old directory structure.

diff --git a/common.dump b/common.dump
index ee5824ed5445a96d53a22ccef8e1c26a87b3acce..e4c60fded31390db6c319f9a0e433a911dafa748 100644 (file)
--- a/common.dump
+++ b/common.dump
@@ -272,10 +272,10 @@ _stable_fs()
 }
 
 #
-# Run stress/src/fsstress to create a mixture of 
+# Run src/fsstress to create a mixture of 
 # files,dirs,links,symlinks
 #
-# Pinched from stress/013.
+# Pinched from test 013.
 #
 _create_dumpdir_stress()
 {
@@ -372,7 +372,7 @@ End-of-File
 # Create a bunch of directories/files of different sizes
 # filled with data.
 #
-# Pinched from stress/001.
+# Pinched from test 001.
 #
 _do_create_dumpdir_fill()
 {

diff --git a/tools/README.auto-qa b/tools/README.auto-qa
index fa36165ac0cabbfe4719f6953ab3320c1ddef97a..16689ea3616f34e563c9ad32440c40b1b547716e 100644 (file)
--- a/tools/README.auto-qa
+++ b/tools/README.auto-qa
@@ -4,13 +4,13 @@ ______________________                                      ______________
 
        - pick/create a user to run auto-qa and check they 
             can use ptools to check out of the tree
-       - add your host to cmd/xfs/stress/common.config
-       - add your host to cmd/xfs/tools/auto-qa
+       - add your host to cmd/xfstests/common.config
+       - add your host to cmd/xfstests/tools/auto-qa
                check both these files in
        - make a directory "$HOME/qa"
        - make a workarea "$HOME/qa/linux-xfs" for linux-xfs
                (easiest to copy one from elsewhere)
-       - cd $HOME/qa ; ln -s linux-xfs/cmd/xfs/tools/auto-qa .
+       - cd $HOME/qa ; ln -s linux-xfs/cmd/xfstests/tools/auto-qa .
                (auto-qa must be a link into it's own source tree
                so it can update itself)
        - copy an appropriate .config file to
@@ -65,7 +65,7 @@ Notes:
        - When run in "cron-init" or "init" states, the script
                will p_tupdate itself and restart. If you start
                with an empty source tree, you'll need to check
-               out the cmd/xfs/tools/auto-qa script before it'll
+               out the cmd/xfstests/tools/auto-qa script before it'll
                work (duh).
 
 good luck.

diff --git a/tools/auto-qa b/tools/auto-qa
index 861c721b78465632643e05e17c409c28014038b9..fb06ec70ea6cf1a874999551361f45dcdeac7fdb 100755 (executable)
--- a/tools/auto-qa
+++ b/tools/auto-qa
@@ -79,15 +79,15 @@ export WORKAREA="$ROOT/linux-xfs"
 
 export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin/ptools:/usr/local/bin"
 STATE=$ROOT/qa.state
-QADIR="$WORKAREA/cmd/xfs/stress"
+QADIR="$WORKAREA/cmd/xfstests"
 SUDO="su -c"
 IMAGE="$BOOT/vmlinuz-$VERSION$EXTRA"
 SYSTEMMAP="$BOOT/System.map-$VERSION$EXTRA"
 CONFIG="$ROOT/$HOST-$VERSION$EXTRA.config"
 MODULES="/lib/modules/$VERSION$EXTRA"
 SELF="$ROOT/auto-qa"
-SELF_UPDATE="cmd/xfs/tools/auto-qa"
-COMMON_CONFIG="$WORKAREA/cmd/xfs/stress/common.config"
+SELF_UPDATE="cmd/xfstests/tools/auto-qa"
+COMMON_CONFIG="$WORKAREA/cmd/xfstests/common.config"
 SH="/bin/sh"
 LOG="$ROOT/qa.log"
 
@@ -276,32 +276,22 @@ do
             ;;
             
         *clean)
-            # we need to configure or else we might fail to clean stress/src
-            _log "        *** configure for clean"
-            cd $WORKAREA/cmd/xfs
-            make configure 2>&1 \
-                                    || _fail "            !!! configure for clean failed"
-                                    
-            _log "        *** clean stress/src"
-            cd $WORKAREA/cmd/xfs/stress/src
-            make clobber 2>&1 \
-                                    || _fail "            !!! clean stress/src failed"
-
-            _log "        *** clean xfs tools"
-            cd $WORKAREA/cmd/xfs
-            make realclean 2>&1 \
-                                    || _fail "            !!! clean tools failed"
+            # we need to configure or else we might fail to clean
+            for pkg in attr acl xfsprogs xfsdump xfstests
+                cd $WORKAREA/cmd/$pkg
+                _log "        *** configure $pkg for clean"
+                make configure 2>&1 \
+                                    || _fail "            !!! configure $pkg for clean failed"
+                _log "        *** clean $pkg tools"
+                make realclean 2>&1 \
+                                    || _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 qa"
-            cd $WORKAREA/cmd/xfs/stress
-            rm -f *.full *.bad *.log *.time *.core core 2>&1 \
-                                    || _fail "            !!! clean qa failed"
-
             _log "        *** clean linux"
             cd $WORKAREA/linux
             make mrproper 2>&1 \
@@ -346,29 +336,31 @@ do
             make -j2 EXTRAVERSION=$EXTRA modules 2>&1 \
                                     || _fail "            !!! build modules failed"
                                     
-            _log "        *** build tools"
-            cd $WORKAREA/cmd/xfs
-            
-            # use e-fence - but this will only take effect on configure
-            export MALLOCLIB=/usr/lib/libefence.a
-            make configure 2>&1 \
-                                    || _fail "            !!! configure tools failed"
-            make default 2>&1 \
-                                    || _fail "            !!! build tools failed"
+            _log "        *** build and install tools"
+            for pkg in attr acl xfsprogs xfsdump xfstests 
+            do
+                cd $WORKAREA/cmd/$pkg
+
+                # use e-fence - but this will only take effect on configure
+                export MALLOCLIB=/usr/lib/libefence.a
+                make configure 2>&1 \
+                                    || _fail "            !!! configure $pkg failed"
+                make default 2>&1 \
+                                    || _fail "            !!! build $pkg failed"
+
+                _sudo make install install-dev 2>&1 \
+                                    || _fail "            !!! install $pkg failed"
+            done
 
-            _log "        *** build quota tools"
+            _log "        *** build and install quota tools"
             cd $WORKAREA/cmd/quota
             
             # use e-fence - but this will only take effect on configure
             export MALLOCLIB=/usr/lib/libefence.a
             ( rm -f configure ; autoconf ; sh configure ; make all ) 2>&1 \
                                     || _fail "            !!! build quota failed"
-
-            _log "        *** build stress/src"
-            cd $WORKAREA/cmd/xfs/stress/src
-            
-            make default 2>&1 \
-                                    || _fail "            !!! build stress/src failed"
+            _sudo make install 2>&1 \
+                                    || _fail "            !!! install quota failed"
 
             new_state="install"
             ;;
@@ -387,16 +379,6 @@ do
             _sudo make EXTRAVERSION=$EXTRA modules_install 2>&1 \
                                     || _fail "            !!! install modules failed"
 
-            _log "        *** install xfs tools"
-            cd $WORKAREA/cmd/xfs
-            _sudo make install 2>&1 \
-                                    || _fail "            !!! install tools failed"
-
-            _log "        *** install quota tools"
-            cd $WORKAREA/cmd/quota
-            _sudo make install 2>&1 \
-                                    || _fail "            !!! install quota failed"
-
             _log "        *** reinit lilo"
             _sudo /sbin/lilo 2>&1 \
                                     || _fail "            !!! reinit lilo failed"