fix up irix differences

Merge of master-melb:xfs-cmds:22772a by kenmcd.

  fix up for different irix error msg for too many symlinks

diff --git a/005 b/005
index 45068f8ccb7eca4ca77219f6a590d2b271175608..b5d93d7027f2309707c0173eed68e429b5a983ce 100755 (executable)
--- a/005
+++ b/005
@@ -55,7 +55,9 @@ _cleanup()
 
 _touch()
 {
-    touch $@ 2>&1 | grep -q 'Too many levels of symbolic links'
+    # On IRIX: Too many symbolic links in path name traversal
+    # On Linux: Too many levels of symbolic links
+    touch $@ 2>&1 | tee -a $here/$seq.full | grep -q 'Too many.*symbolic links'
     if [ $? -eq 0 ]; then
        echo "ELOOP returned.  Good."
     else
@@ -68,6 +70,7 @@ _touch()
 . ./common.filter
 
 # real QA test starts here
+rm -f $here/$seq.full
 _supported_fs xfs udf nfs
 
 # IRIX UDF does not support symlinks

diff --git a/096 b/096
index 456b471a29591019e6881b184b63ee8c20a7cf51..53a9032f5170517abce73e57399d34cff7255106 100755 (executable)
--- a/096
+++ b/096
@@ -64,6 +64,8 @@ _cleanup()
 # filter out differences between linux and irix:
 #   - sectsz on Linux
 #   - mmr, mixed-case on IRIX
+#   - lazy-count on IRIX
+#   - inode-paths on IRIX
 #   - trailing spaces on Linux but not on IRIX
 #
 _mkfs_filter()
@@ -79,6 +81,8 @@ _mkfs_filter()
        -e '/ *= *mmr=[0-9][0-9]* *$/d' \
        -e 's/ *mixed-case=[YN]//' \
        -e 's/sectsz=[0-9][0-9]* *//' \
+       -e 's/, lazy-count.*//' \
+       -e '/inode-paths/d' \
        -e 's/ *$//'
 }