fix up irix differences

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

  fix up for different irix error msg for too many symlinks
This commit is contained in:
Tim Shimmin
2005-06-02 03:48:53 +00:00
parent 443293519d
commit f5a18fe143
2 changed files with 8 additions and 1 deletions
+4 -1
View File
@@ -55,7 +55,9 @@ _cleanup()
_touch() _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 if [ $? -eq 0 ]; then
echo "ELOOP returned. Good." echo "ELOOP returned. Good."
else else
@@ -68,6 +70,7 @@ _touch()
. ./common.filter . ./common.filter
# real QA test starts here # real QA test starts here
rm -f $here/$seq.full
_supported_fs xfs udf nfs _supported_fs xfs udf nfs
# IRIX UDF does not support symlinks # IRIX UDF does not support symlinks
+4
View File
@@ -64,6 +64,8 @@ _cleanup()
# filter out differences between linux and irix: # filter out differences between linux and irix:
# - sectsz on Linux # - sectsz on Linux
# - mmr, mixed-case on IRIX # - mmr, mixed-case on IRIX
# - lazy-count on IRIX
# - inode-paths on IRIX
# - trailing spaces on Linux but not on IRIX # - trailing spaces on Linux but not on IRIX
# #
_mkfs_filter() _mkfs_filter()
@@ -79,6 +81,8 @@ _mkfs_filter()
-e '/ *= *mmr=[0-9][0-9]* *$/d' \ -e '/ *= *mmr=[0-9][0-9]* *$/d' \
-e 's/ *mixed-case=[YN]//' \ -e 's/ *mixed-case=[YN]//' \
-e 's/sectsz=[0-9][0-9]* *//' \ -e 's/sectsz=[0-9][0-9]* *//' \
-e 's/, lazy-count.*//' \
-e '/inode-paths/d' \
-e 's/ *$//' -e 's/ *$//'
} }