From: fsgqa <fsgqa>
Date: Thu, 17 Jul 2003 04:09:59 +0000 (+0000)
Subject: QA updates
X-Git-Tag: v1.1.0~961
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=518f774f3049a78e8d589429e07ca19428265edc;ds=sidebyside

QA updates
---

diff --git a/common.rc b/common.rc
index 0d4322fd..2dc706d8 100644
--- a/common.rc
+++ b/common.rc
@@ -666,8 +666,13 @@ then
         # $TEST_DEV is not mounted
         if ! _test_mount
         then
-            echo "common.rc: could not mount $TEST_DEV on $TEST_DIR"
-            exit 1
+            echo "common.rc: retrying test device mount with external set"
+            [ "$USE_EXTERNAL" != "yes" ] && USE_EXTERNAL=yes
+            if ! _test_mount
+            then
+                echo "common.rc: could not mount $TEST_DEV on $TEST_DIR"
+                exit 1
+            fi
         fi
     fi
     
diff --git a/configure.in b/configure.in
index b545b03b..56150c99 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,6 @@ AC_PACKAGE_NEED_UUIDCOMPARE
 
 AC_PACKAGE_NEED_XFS_LIBXFS_H
 AC_PACKAGE_NEED_XFSCTL_MACRO
-AC_PACKAGE_NEED_LIBXFSINIT_LIBXFS
 AC_PACKAGE_NEED_XFS_HANDLE_H
 AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE
 
diff --git a/setup b/setup
index 51c941aa..f3cfb463 100755
--- a/setup
+++ b/setup
@@ -6,11 +6,12 @@ then
     exit 1
 fi
 
-use="(external=no)"
-[ "$USE_EXTERNAL" = yes ] && use="(external=yes)"
+[ "$USE_EXTERNAL" != yes ] && USE_EXTERNAL="no"
+[ "$USE_LBD_PATCH" = yes ] || USE_LBD_PATCH="no"
 
 cat <<EOF
 TEST: DIR=$TEST_DIR DEV=$TEST_DEV rt=[$TEST_RTDEV] log=[$TEST_LOGDEV]
 TAPE: dev=[$TAPE_DEV] rmt=[$RMT_TAPE_DEV] rmtirix=[$RMT_TAPE_USER@$RMT_IRIXTAPE_DEV]
-SCRATCH: MNT=$SCRATCH_MNT DEV=$SCRATCH_DEV rt=[$SCRATCH_RTDEV] log=[$SCRATCH_LOGDEV]  $use
+SCRATCH: MNT=$SCRATCH_MNT DEV=$SCRATCH_DEV rt=[$SCRATCH_RTDEV] log=[$SCRATCH_LOGDEV]
+VARIABLES: external=$USE_EXTERNAL largeblk=$USE_LBD_PATCH
 EOF
diff --git a/src/Makefile b/src/Makefile
index 231456f8..8488efeb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -64,8 +64,8 @@ nametest: nametest.o $(LIBTEST)
 bstat: bstat.o $(LIBHANDLE)
 	$(LINKTEST) $(LIBHANDLE) $(LDLIBS)
 
-loggen:	loggen.o $(LIBXFS)
-	$(LINKTEST) $(LIBXFS) $(LDLIBS)
+loggen:	loggen.o
+	$(LINKTEST) $(LDLIBS)
 
 acl_get: acl_get.o $(LIBACL) $(LIBATTR)
 	$(LINKTEST) $(LIBACL) $(LIBATTR) $(LDLIBS)