Update several QA tests, configure magic in xfstests directory.

Fix up filters to handle additional xfs_db output.

diff --git a/021 b/021
index 29800f34b0a45f0068387ce5165fc3cc4862ace8..e8066a00527f969f03d2a6ea9fd7f81436e20efa 100755 (executable)
--- a/021
+++ b/021
@@ -139,7 +139,8 @@ umount $SCRATCH_DEV >>$seq.full 2>&1 \
 
 echo "*** dump attributes (1)"
 
-xfs_db -r -c "inode $inum_1" -c "print a.sfattr" $SCRATCH_DEV
+xfs_db -r -c "inode $inum_1" -c "print a.sfattr" $SCRATCH_DEV | \
+       sed -e '/secure = /d'
 
 echo "*** dump attributes (2)"
 
@@ -148,6 +149,7 @@ xfs_db -r -c "inode $inum_2" -c "a a.bmx[0].startblock" -c print $SCRATCH_DEV \
 s/^(hdr.firstused =) (\d+)/\1 FIRSTUSED/;
 s/^(hdr.freemap\[0-2] = \[base,size]).*/\1 [FREEMAP..]/;
 s/^(entries\[0-2] = \[hashval,nameidx,incomplete,root,local]).*/\1 [ENTRIES..]/;
+s/^(entries\[0-2] = \[hashval,nameidx,incomplete,root,secure,local]).*/\1 [ENTRIES..]/;
        print;'
 
 echo "*** done"

diff --git a/040 b/040
index cdd0b1e76815b41460f656914e871f3dacd74d6e..4bbd8d4229ca676acfdc6e469d17bb65f565634e 100755 (executable)
--- a/040
+++ b/040
@@ -50,31 +50,20 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common.rc
 . ./common.filter
 
-# real QA test starts here
-
-cd `pwd`
-
-if [ -z "$WORKAREA" ]
-then
-    _notrun "Can't run srcdiff without WORKAREA set"
-fi
-
-if [ ! -f $WORKAREA/xfstests/tools/srcdiff ]
-then
-    _notrun "Can't find srcdiff tool under \"$WORKAREA\""
-fi
+[ -z "$KWORKAREA" ] && \
+       _notrun "Can't run srcdiff without KWORKAREA set"
+[ -d "$KWORKAREA/fs/xfs" ] || \
+       _notrun "Can't find XFS source under \"$KWORKAREA\""
 
-if [ ! -d $WORKAREA/linux/fs/xfs ]
-then
-    _notrun "Can't find XFS source under \"$WORKAREA\""
-fi
+[ -z "$WORKAREA" ] && \
+       _notrun "Can't run srcdiff without WORKAREA set"
+[ -f "$WORKAREA/xfstests/tools/srcdiff" ] || \
+       _notrun "Can't find srcdiff tool under \"$WORKAREA\""
+[ -d "$WORKAREA/xfsprogs/include" ] || \
+       _notrun "Can't find XFS command headers under \"$WORKAREA\""
 
-if [ ! -d $WORKAREA/xfsprogs/include ]
-then
-    _notrun "Can't find XFS command headers under \"$WORKAREA\""
-fi
-
-cd $WORKAREA/xfstests
+# real QA test starts here
+cd "$WORKAREA/xfstests"
 echo Silence is golden.
 perl tools/srcdiff -q >$seq.full
 if ! diff $seq.full $seq.good >/dev/null; then

diff --git a/aclocal.m4 b/aclocal.m4
index 817fd3e4ad484bec9fc50e65a0509ad1e804ac2a..155a923db8e7af37275942660daa8fb55108f667 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -227,7 +227,7 @@ AC_DEFUN([AC_PACKAGE_NEED_LIBXFSINIT_LIBXFS],
         echo
         echo 'FATAL ERROR: could not find a valid XFS base library.'
         echo 'Install or upgrade the XFS library package.'
-        echo 'Alternatively, run "make install-lib" from the xfsprogs source.'
+        echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
         exit 1
     ])
     libxfs="-lxfs"
@@ -242,7 +242,7 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE],
         echo
         echo 'FATAL ERROR: could not find a current XFS handle library.'
         echo 'Install or upgrade the XFS library package.'
-        echo 'Alternatively, run "make install-lib" from the xfsprogs source.'
+        echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
         exit 1
     ])
     libhdl="-lhandle"

diff --git a/m4/package_types.m4 b/m4/package_types.m4
index 1bd69751096c26e0260ab32dc60461293d4cb5ca..91db64e987e601ccd654be0d77ce5fdde30e44b7 100644 (file)
--- a/m4/package_types.m4
+++ b/m4/package_types.m4
@@ -35,13 +35,13 @@ AC_DEFUN([AC_SIZEOF_POINTERS_AND_LONG],
     fi
     AC_CHECK_SIZEOF(long, 4)
     AC_CHECK_SIZEOF(char *, 4)
-    if test $ac_cv_sizeof_long -eq 4; then
+    if test $ac_cv_sizeof_long -eq 4 -o $ac_cv_sizeof_long -eq 0; then
       AC_DEFINE(HAVE_32BIT_LONG)
     fi
     if test $ac_cv_sizeof_long -eq 8; then
       AC_DEFINE(HAVE_64BIT_LONG)
     fi
-    if test $ac_cv_sizeof_char_p -eq 4; then
+    if test $ac_cv_sizeof_char_p -eq 4 -o $ac_cv_sizeof_char_p -eq 0; then
       AC_DEFINE(HAVE_32BIT_PTR)
     fi
     if test $ac_cv_sizeof_char_p -eq 8; then

diff --git a/m4/package_xfslibs.m4 b/m4/package_xfslibs.m4
index cf38ff0f7ead0419cd30c80e53b0b48c230f3455..3d659553aac732e74f238a4642aa2495efab7eec 100644 (file)
--- a/m4/package_xfslibs.m4
+++ b/m4/package_xfslibs.m4
@@ -25,7 +25,7 @@ AC_DEFUN([AC_PACKAGE_NEED_LIBXFSINIT_LIBXFS],
         echo
         echo 'FATAL ERROR: could not find a valid XFS base library.'
         echo 'Install or upgrade the XFS library package.'
-        echo 'Alternatively, run "make install-lib" from the xfsprogs source.'
+        echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
         exit 1
     ])
     libxfs="-lxfs"
@@ -40,7 +40,7 @@ AC_DEFUN([AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE],
         echo
         echo 'FATAL ERROR: could not find a current XFS handle library.'
         echo 'Install or upgrade the XFS library package.'
-        echo 'Alternatively, run "make install-lib" from the xfsprogs source.'
+        echo 'Alternatively, run "make install-dev" from the xfsprogs source.'
         exit 1
     ])
     libhdl="-lhandle"

diff --git a/tools/srcdiff b/tools/srcdiff
index b64ca68d928ce084e4b5182b219f2b6e18912427..b1aad5160507d5803788190a730526fa09fc1441 100755 (executable)
--- a/tools/srcdiff
+++ b/tools/srcdiff
@@ -28,8 +28,8 @@ die "KWORKAREA not set" unless defined $ENV{'KWORKAREA'};
 chdir $ENV{'WORKAREA'};
 my $kworkarea = $ENV{'KWORKAREA'};
 my $xdiff = $ENV{'XDIFF'};
-my $quiet=0;
-my $usage=0;
+my $quiet = 0;
+my $usage = 0;
 
 foreach (@ARGV) {
        if (/^-q$/) {
@@ -57,8 +57,7 @@ my @difflist = qw(
        xfs_imap.h  xfs_ialloc_btree.h  xfs_inode.h  xfs_inode_item.h
        xfs_inum.h  xfs_log.h  xfs_log_priv.h  xfs_log_recover.h
        xfs_mount.h  xfs_quota.h  xfs_rtalloc.h
-       xfs_sb.h  xfs_trans.h  xfs_trans_space.h  xfs_types.h
-       xfs_fs.h xfs_acl.h xfs_cap.h xfs_mac.h
+       xfs_sb.h  xfs_trans.h  xfs_trans_space.h  xfs_types.h  xfs_fs.h
 );
 
 sub straightdiff {