fixups for qa after build changes

diff --git a/040 b/040
index 8d8a3ea3e988f1afda15dcda196ccf34a88dcec2..8e75ad186e14ec9305d9edcee119d790b8fd48e9 100755 (executable)
--- a/040
+++ b/040
@@ -60,7 +60,7 @@ then
     export WORKAREA=../../..
 fi
 
     export WORKAREA=../../..
 fi
 

-if [ ! -f $WORKAREA/cmd/xfs/tools/srcdiff ]
+if [ ! -f $WORKAREA/cmd/xfstests/tools/srcdiff ]

 then
     _notrun "Can't find srcdiff tool under \"$WORKAREA\""
 fi
 then
     _notrun "Can't find srcdiff tool under \"$WORKAREA\""
 fi


@@ -70,12 +70,12 @@ then
     _notrun "Can't find XFS source under \"$WORKAREA\""
 fi
 
     _notrun "Can't find XFS source under \"$WORKAREA\""
 fi
 

-if [ ! -d $WORKAREA/cmd/xfs/include ]
+if [ ! -d $WORKAREA/cmd/xfsprogs/include ]

 then
     _notrun "Can't find XFS command headers under \"$WORKAREA\""
 fi
 
 then
     _notrun "Can't find XFS command headers under \"$WORKAREA\""
 fi
 

-cd $WORKAREA/cmd/xfs/tools
+cd $WORKAREA/cmd/xfstests/tools

 perl ./srcdiff -q
 
 # success, all done
 perl ./srcdiff -q
 
 # success, all done

diff --git a/tools/auto-qa b/tools/auto-qa
index fb06ec70ea6cf1a874999551361f45dcdeac7fdb..ca59e18b9ffaf49ac8d5f4be248a40f47cde39d1 100755 (executable)
--- a/tools/auto-qa
+++ b/tools/auto-qa
@@ -278,10 +278,8 @@ do
         *clean)
             # we need to configure or else we might fail to clean
             for pkg in attr acl xfsprogs xfsdump xfstests
         *clean)
             # we need to configure or else we might fail to clean
             for pkg in attr acl xfsprogs xfsdump xfstests

+           do

                 cd $WORKAREA/cmd/$pkg
                 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"
                 _log "        *** clean $pkg tools"
                 make realclean 2>&1 \
                                     || _fail "            !!! clean $pkg failed"