xfs: test regression in xfs_bmap_validate_extent

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

diff --git a/tools/auto-qa b/tools/auto-qa
index 35e6c532bc57fad20c2ae56c7a430f871baad9cb..1beb2835916504bf08fb49910fb5ec1f03265c94 100755 (executable)
--- a/tools/auto-qa
+++ b/tools/auto-qa
@@ -1,36 +1,7 @@
 #!/bin/sh
-#
+# SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
-# 
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
-# 
-# This program is distributed in the hope that it would be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# 
-# Further, this software is distributed without any warranty that it is
-# free of the rightful claim of any third person regarding infringement
-# or the like.  Any license provided herein, whether implied or
-# otherwise, applies only to this software file.  Patent licenses, if
-# any, provided herein do not apply to combinations of this program with
-# other software, or any other product whatsoever.
-# 
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write the Free Software Foundation, Inc., 59
-# Temple Place - Suite 330, Boston MA 02111-1307, USA.
-# 
-# Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
-# Mountain View, CA  94043, or:
-# 
-# http://www.sgi.com 
-# 
-# For further information regarding this notice, see: 
-# 
-# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
 #
-
 # automatic qa system. 31/08/00 dxm@sgi.com
 #
 # Usage: auto_qa start-state [stop-state]
@@ -101,7 +72,7 @@ STATE=$ROOT/qa.state
 QADIR="$WORKAREA/xfstests"
 SUDO="su -c"
 CONFIG="$ROOT/$HOST.config"
-COMMON_CONFIG="$QADIR/common.config"
+COMMON_CONFIG="$QADIR/common/config"
 SH="/bin/sh"
 LOG="$ROOT/qa.log"
 
@@ -216,7 +187,7 @@ _test_mount()
         TEST_OPTIONS="$TEST_OPTIONS -ortdev=$TEST_RTDEV"
     [ "$USE_EXTERNAL" = yes -a ! -z "$TEST_LOGDEV" ] && \
         TEST_OPTIONS="$TEST_OPTIONS -ologdev=$TEST_LOGDEV"
-    _sudo mount -t xfs $TEST_OPTIONS $* $TEST_DEV $TEST_DIR
+    _sudo mount -t xfs $TEST_OPTIONS $MOUNT_OPTIONS $* $TEST_DEV $TEST_DIR
 }
 
 _i386_install()
@@ -317,6 +288,8 @@ do
     _log "     (user=$USER, host=$HOST)"
     new_state=""
 
+    start_state=$state
+
     case $state
     in
        *init)
@@ -335,7 +308,7 @@ do
 
        *cleantools)
            # we need to configure or else we might fail to clean
-           for pkg in attr acl xfsprogs dmapi xfsdump xfstests
+           for pkg in attr acl xfsprogs xfsdump xfstests
            do
                [ -d $WORKAREA/$pkg ] || continue
                cd $WORKAREA/$pkg
@@ -348,12 +321,11 @@ do
 
        *buildtools)
            _log "      *** build and install tools"
-           for pkg in attr acl xfsprogs dmapi xfsdump xfstests 
+           for pkg in attr acl xfsprogs xfsdump xfstests 
            do
                [ -d $WORKAREA/$pkg ] || continue
                cd $WORKAREA/$pkg
 
-               # use e-fence - but this will only take effect on configure
                make configure 2>&1 \
                        || _fail "          !!! configure $pkg failed"
                make default 2>&1 \
@@ -581,7 +553,7 @@ do
     if [ -n "$stop_state" ]
     then
         # remove hyphen prefixes
-       s1=`echo $state | sed 's/.*-//'`
+       s1=`echo $start_state | sed 's/.*-//'`
        s2=`echo $stop_state | sed 's/.*-//'`
 
        if [ $s1 = $s2 ]