Update filtering so this test can be identical on IRIX.

This commit is contained in:
Tim Shimmin
2002-03-06 04:57:59 +00:00
parent eb6404860e
commit 51b54421ba
2 changed files with 30 additions and 46 deletions
+5 -3
View File
@@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# XFS QA Test No. 065 # XFS QA Test No. 065
# $Id: 065,v 1.2 2002/01/17 07:30:09 tes Exp $ # $Id: 065,v 1.3 2002/01/21 20:47:24 nathans Exp $
# #
# Testing incremental dumps and cumulative restores with # Testing incremental dumps and cumulative restores with
# "adding, deleting, renaming, linking, and unlinking files and # "adding, deleting, renaming, linking, and unlinking files and
@@ -66,10 +66,12 @@ _my_ls_filter()
# Filter out the housekeeping files of xfsrestore # Filter out the housekeeping files of xfsrestore
# Filter out toplevel "dumpdir/$" report. # Filter out toplevel "dumpdir/$" report.
# #
$AWK_PROG 'NF == 9 { print $5, $9; next } $AWK_PROG '
NF == 9 && $0 ~ /dir/ { print $9; next }
NF == 9 { print $5, $9; next }
NF == 1 { print } ' |\ NF == 1 { print } ' |\
sed -e 's/.*dumpdir/dumpdir/' |\ sed -e 's/.*dumpdir/dumpdir/' |\
egrep -v 'housekeeping|dirattr|dirextattr|namreg|state|tree|dumpdir/$' |\ egrep -v 'housekeeping|dirattr|dirextattr|namreg|state|tree|dumpdir/$|dumpdir:$' |\
egrep -v "$restore_dir:" egrep -v "$restore_dir:"
} }
+24 -42
View File
@@ -1,11 +1,10 @@
QA output created by 065 QA output created by 065
Do the incremental dumps Do the incremental dumps
Listing of what files we have at level 0: Listing of what files we have at level 0:
dumpdir: addeddir1/
6 addeddir1/ addeddir2/
6 addeddir2/ addeddir3/
23 addeddir3/ addeddir4/
23 addeddir4/
5 addedfile0 5 addedfile0
5 addedfile1 5 addedfile1
5 addedfile2 5 addedfile2
@@ -41,9 +40,8 @@ xfsdump: dump size (non-dir files) : NUM bytes
xfsdump: dump complete: SECS seconds elapsed xfsdump: dump complete: SECS seconds elapsed
xfsdump: Dump Status: SUCCESS xfsdump: Dump Status: SUCCESS
Listing of what files we have at level 1: Listing of what files we have at level 1:
dumpdir: addeddir1/
6 addeddir1/ addeddir4/
23 addeddir4/
5 addedfile0 5 addedfile0
5 addedfile1 5 addedfile1
5 addedfile3 5 addedfile3
@@ -74,9 +72,8 @@ xfsdump: dump size (non-dir files) : NUM bytes
xfsdump: dump complete: SECS seconds elapsed xfsdump: dump complete: SECS seconds elapsed
xfsdump: Dump Status: SUCCESS xfsdump: Dump Status: SUCCESS
Listing of what files we have at level 2: Listing of what files we have at level 2:
dumpdir: addeddir2/
6 addeddir2/ addeddir6/
23 addeddir6/
5 addedfile0 5 addedfile0
5 addedfile2 5 addedfile2
5 addedfile3 5 addedfile3
@@ -107,9 +104,8 @@ xfsdump: dump size (non-dir files) : NUM bytes
xfsdump: dump complete: SECS seconds elapsed xfsdump: dump complete: SECS seconds elapsed
xfsdump: Dump Status: SUCCESS xfsdump: Dump Status: SUCCESS
Listing of what files we have at level 3: Listing of what files we have at level 3:
dumpdir: addeddir2/
6 addeddir2/ addeddir6/
23 addeddir6/
5 addedfile0 5 addedfile0
5 addedfile2 5 addedfile2
5 addedfile3 5 addedfile3
@@ -144,9 +140,8 @@ xfsdump: dump size (non-dir files) : NUM bytes
xfsdump: dump complete: SECS seconds elapsed xfsdump: dump complete: SECS seconds elapsed
xfsdump: Dump Status: SUCCESS xfsdump: Dump Status: SUCCESS
Listing of what files we have at level 4: Listing of what files we have at level 4:
dumpdir: addeddir2/
6 addeddir2/ addeddir6/
6 addeddir6/
5 addedfile0 5 addedfile0
5 addedfile3 5 addedfile3
5 linkfile0_1 5 linkfile0_1
@@ -177,7 +172,6 @@ xfsdump: dump size (non-dir files) : NUM bytes
xfsdump: dump complete: SECS seconds elapsed xfsdump: dump complete: SECS seconds elapsed
xfsdump: Dump Status: SUCCESS xfsdump: Dump Status: SUCCESS
Listing of what files we have at level 5: Listing of what files we have at level 5:
dumpdir:
5 addedfile6 5 addedfile6
5 linkfile6_1 5 linkfile6_1
5 linkfile6_2 5 linkfile6_2
@@ -206,7 +200,6 @@ xfsdump: dump size (non-dir files) : NUM bytes
xfsdump: dump complete: SECS seconds elapsed xfsdump: dump complete: SECS seconds elapsed
xfsdump: Dump Status: SUCCESS xfsdump: Dump Status: SUCCESS
Listing of what files we have at level 6: Listing of what files we have at level 6:
dumpdir:
5 addedfile6_mv 5 addedfile6_mv
5 linkfile6_mv_1 5 linkfile6_mv_1
5 linkfile6_mv_2 5 linkfile6_mv_2
@@ -235,7 +228,6 @@ xfsdump: dump size (non-dir files) : NUM bytes
xfsdump: dump complete: SECS seconds elapsed xfsdump: dump complete: SECS seconds elapsed
xfsdump: Dump Status: SUCCESS xfsdump: Dump Status: SUCCESS
Listing of what files we have at level 7: Listing of what files we have at level 7:
dumpdir:
5 addedfile6_mv 5 addedfile6_mv
5 linkfile6_mv_1 5 linkfile6_mv_1
5 linkfile6_mv_2 5 linkfile6_mv_2
@@ -264,7 +256,6 @@ xfsdump: dump size (non-dir files) : NUM bytes
xfsdump: dump complete: SECS seconds elapsed xfsdump: dump complete: SECS seconds elapsed
xfsdump: Dump Status: SUCCESS xfsdump: Dump Status: SUCCESS
Listing of what files we have at level 8: Listing of what files we have at level 8:
dumpdir:
5 addedfile6_mv 5 addedfile6_mv
5 linkfile6_mv_1 5 linkfile6_mv_1
5 linkfile6_mv_2 5 linkfile6_mv_2
@@ -588,11 +579,10 @@ xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed xfsrestore: restore complete: SECS seconds elapsed
xfsrestore: Restore Status: SUCCESS xfsrestore: Restore Status: SUCCESS
ls -lRF restore_dir ls -lRF restore_dir
dumpdir: addeddir1/
6 addeddir1/ addeddir2/
6 addeddir2/ addeddir3/
23 addeddir3/ addeddir4/
23 addeddir4/
5 addedfile0 5 addedfile0
5 addedfile1 5 addedfile1
5 addedfile2 5 addedfile2
@@ -630,9 +620,8 @@ xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed xfsrestore: restore complete: SECS seconds elapsed
xfsrestore: Restore Status: SUCCESS xfsrestore: Restore Status: SUCCESS
ls -lRF restore_dir ls -lRF restore_dir
dumpdir: addeddir1/
6 addeddir1/ addeddir4/
23 addeddir4/
5 addedfile0 5 addedfile0
5 addedfile1 5 addedfile1
5 addedfile3 5 addedfile3
@@ -666,9 +655,8 @@ xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed xfsrestore: restore complete: SECS seconds elapsed
xfsrestore: Restore Status: SUCCESS xfsrestore: Restore Status: SUCCESS
ls -lRF restore_dir ls -lRF restore_dir
dumpdir: addeddir2/
6 addeddir2/ addeddir6/
23 addeddir6/
5 addedfile0 5 addedfile0
5 addedfile2 5 addedfile2
5 addedfile3 5 addedfile3
@@ -702,9 +690,8 @@ xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed xfsrestore: restore complete: SECS seconds elapsed
xfsrestore: Restore Status: SUCCESS xfsrestore: Restore Status: SUCCESS
ls -lRF restore_dir ls -lRF restore_dir
dumpdir: addeddir2/
6 addeddir2/ addeddir6/
23 addeddir6/
5 addedfile0 5 addedfile0
5 addedfile2 5 addedfile2
5 addedfile3 5 addedfile3
@@ -742,9 +729,8 @@ xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed xfsrestore: restore complete: SECS seconds elapsed
xfsrestore: Restore Status: SUCCESS xfsrestore: Restore Status: SUCCESS
ls -lRF restore_dir ls -lRF restore_dir
dumpdir: addeddir2/
6 addeddir2/ addeddir6/
6 addeddir6/
5 addedfile0 5 addedfile0
5 addedfile3 5 addedfile3
5 linkfile0_1 5 linkfile0_1
@@ -778,7 +764,6 @@ xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed xfsrestore: restore complete: SECS seconds elapsed
xfsrestore: Restore Status: SUCCESS xfsrestore: Restore Status: SUCCESS
ls -lRF restore_dir ls -lRF restore_dir
dumpdir:
5 addedfile6 5 addedfile6
5 linkfile6_1 5 linkfile6_1
5 linkfile6_2 5 linkfile6_2
@@ -810,7 +795,6 @@ xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed xfsrestore: restore complete: SECS seconds elapsed
xfsrestore: Restore Status: SUCCESS xfsrestore: Restore Status: SUCCESS
ls -lRF restore_dir ls -lRF restore_dir
dumpdir:
5 addedfile6_mv 5 addedfile6_mv
5 linkfile6_mv_1 5 linkfile6_mv_1
5 linkfile6_mv_2 5 linkfile6_mv_2
@@ -842,7 +826,6 @@ xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed xfsrestore: restore complete: SECS seconds elapsed
xfsrestore: Restore Status: SUCCESS xfsrestore: Restore Status: SUCCESS
ls -lRF restore_dir ls -lRF restore_dir
dumpdir:
5 addedfile6_mv 5 addedfile6_mv
5 linkfile6_mv_1 5 linkfile6_mv_1
5 linkfile6_mv_2 5 linkfile6_mv_2
@@ -874,7 +857,6 @@ xfsrestore: restoring non-directory files
xfsrestore: restore complete: SECS seconds elapsed xfsrestore: restore complete: SECS seconds elapsed
xfsrestore: Restore Status: SUCCESS xfsrestore: Restore Status: SUCCESS
ls -lRF restore_dir ls -lRF restore_dir
dumpdir:
5 addedfile6_mv 5 addedfile6_mv
5 linkfile6_mv_1 5 linkfile6_mv_1
5 linkfile6_mv_2 5 linkfile6_mv_2