From: Tim Shimmin Date: Wed, 6 Mar 2002 04:57:59 +0000 (+0000) Subject: Update filtering so this test can be identical on IRIX. X-Git-Tag: v1.1.0~1146 X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=51b54421bade08d9ec996535e7a0d73ee40b3b56 Update filtering so this test can be identical on IRIX. --- diff --git a/065 b/065 index 90293031..753018fc 100755 --- a/065 +++ b/065 @@ -1,6 +1,6 @@ #! /bin/sh # 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 # "adding, deleting, renaming, linking, and unlinking files and @@ -66,10 +66,12 @@ _my_ls_filter() # Filter out the housekeeping files of xfsrestore # Filter out toplevel "dumpdir/$" report. # - $AWK_PROG 'NF == 9 { print $5, $9; next } - NF == 1 { print }' |\ + $AWK_PROG ' + NF == 9 && $0 ~ /dir/ { print $9; next } + NF == 9 { print $5, $9; next } + NF == 1 { print } ' |\ 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:" } diff --git a/065.out b/065.out index 4f235ff0..11854c0c 100644 --- a/065.out +++ b/065.out @@ -1,11 +1,10 @@ QA output created by 065 Do the incremental dumps Listing of what files we have at level 0: -dumpdir: -6 addeddir1/ -6 addeddir2/ -23 addeddir3/ -23 addeddir4/ +addeddir1/ +addeddir2/ +addeddir3/ +addeddir4/ 5 addedfile0 5 addedfile1 5 addedfile2 @@ -41,9 +40,8 @@ xfsdump: dump size (non-dir files) : NUM bytes xfsdump: dump complete: SECS seconds elapsed xfsdump: Dump Status: SUCCESS Listing of what files we have at level 1: -dumpdir: -6 addeddir1/ -23 addeddir4/ +addeddir1/ +addeddir4/ 5 addedfile0 5 addedfile1 5 addedfile3 @@ -74,9 +72,8 @@ xfsdump: dump size (non-dir files) : NUM bytes xfsdump: dump complete: SECS seconds elapsed xfsdump: Dump Status: SUCCESS Listing of what files we have at level 2: -dumpdir: -6 addeddir2/ -23 addeddir6/ +addeddir2/ +addeddir6/ 5 addedfile0 5 addedfile2 5 addedfile3 @@ -107,9 +104,8 @@ xfsdump: dump size (non-dir files) : NUM bytes xfsdump: dump complete: SECS seconds elapsed xfsdump: Dump Status: SUCCESS Listing of what files we have at level 3: -dumpdir: -6 addeddir2/ -23 addeddir6/ +addeddir2/ +addeddir6/ 5 addedfile0 5 addedfile2 5 addedfile3 @@ -144,9 +140,8 @@ xfsdump: dump size (non-dir files) : NUM bytes xfsdump: dump complete: SECS seconds elapsed xfsdump: Dump Status: SUCCESS Listing of what files we have at level 4: -dumpdir: -6 addeddir2/ -6 addeddir6/ +addeddir2/ +addeddir6/ 5 addedfile0 5 addedfile3 5 linkfile0_1 @@ -177,7 +172,6 @@ xfsdump: dump size (non-dir files) : NUM bytes xfsdump: dump complete: SECS seconds elapsed xfsdump: Dump Status: SUCCESS Listing of what files we have at level 5: -dumpdir: 5 addedfile6 5 linkfile6_1 5 linkfile6_2 @@ -206,7 +200,6 @@ xfsdump: dump size (non-dir files) : NUM bytes xfsdump: dump complete: SECS seconds elapsed xfsdump: Dump Status: SUCCESS Listing of what files we have at level 6: -dumpdir: 5 addedfile6_mv 5 linkfile6_mv_1 5 linkfile6_mv_2 @@ -235,7 +228,6 @@ xfsdump: dump size (non-dir files) : NUM bytes xfsdump: dump complete: SECS seconds elapsed xfsdump: Dump Status: SUCCESS Listing of what files we have at level 7: -dumpdir: 5 addedfile6_mv 5 linkfile6_mv_1 5 linkfile6_mv_2 @@ -264,7 +256,6 @@ xfsdump: dump size (non-dir files) : NUM bytes xfsdump: dump complete: SECS seconds elapsed xfsdump: Dump Status: SUCCESS Listing of what files we have at level 8: -dumpdir: 5 addedfile6_mv 5 linkfile6_mv_1 5 linkfile6_mv_2 @@ -588,11 +579,10 @@ xfsrestore: restoring non-directory files xfsrestore: restore complete: SECS seconds elapsed xfsrestore: Restore Status: SUCCESS ls -lRF restore_dir -dumpdir: -6 addeddir1/ -6 addeddir2/ -23 addeddir3/ -23 addeddir4/ +addeddir1/ +addeddir2/ +addeddir3/ +addeddir4/ 5 addedfile0 5 addedfile1 5 addedfile2 @@ -630,9 +620,8 @@ xfsrestore: restoring non-directory files xfsrestore: restore complete: SECS seconds elapsed xfsrestore: Restore Status: SUCCESS ls -lRF restore_dir -dumpdir: -6 addeddir1/ -23 addeddir4/ +addeddir1/ +addeddir4/ 5 addedfile0 5 addedfile1 5 addedfile3 @@ -666,9 +655,8 @@ xfsrestore: restoring non-directory files xfsrestore: restore complete: SECS seconds elapsed xfsrestore: Restore Status: SUCCESS ls -lRF restore_dir -dumpdir: -6 addeddir2/ -23 addeddir6/ +addeddir2/ +addeddir6/ 5 addedfile0 5 addedfile2 5 addedfile3 @@ -702,9 +690,8 @@ xfsrestore: restoring non-directory files xfsrestore: restore complete: SECS seconds elapsed xfsrestore: Restore Status: SUCCESS ls -lRF restore_dir -dumpdir: -6 addeddir2/ -23 addeddir6/ +addeddir2/ +addeddir6/ 5 addedfile0 5 addedfile2 5 addedfile3 @@ -742,9 +729,8 @@ xfsrestore: restoring non-directory files xfsrestore: restore complete: SECS seconds elapsed xfsrestore: Restore Status: SUCCESS ls -lRF restore_dir -dumpdir: -6 addeddir2/ -6 addeddir6/ +addeddir2/ +addeddir6/ 5 addedfile0 5 addedfile3 5 linkfile0_1 @@ -778,7 +764,6 @@ xfsrestore: restoring non-directory files xfsrestore: restore complete: SECS seconds elapsed xfsrestore: Restore Status: SUCCESS ls -lRF restore_dir -dumpdir: 5 addedfile6 5 linkfile6_1 5 linkfile6_2 @@ -810,7 +795,6 @@ xfsrestore: restoring non-directory files xfsrestore: restore complete: SECS seconds elapsed xfsrestore: Restore Status: SUCCESS ls -lRF restore_dir -dumpdir: 5 addedfile6_mv 5 linkfile6_mv_1 5 linkfile6_mv_2 @@ -842,7 +826,6 @@ xfsrestore: restoring non-directory files xfsrestore: restore complete: SECS seconds elapsed xfsrestore: Restore Status: SUCCESS ls -lRF restore_dir -dumpdir: 5 addedfile6_mv 5 linkfile6_mv_1 5 linkfile6_mv_2 @@ -874,7 +857,6 @@ xfsrestore: restoring non-directory files xfsrestore: restore complete: SECS seconds elapsed xfsrestore: Restore Status: SUCCESS ls -lRF restore_dir -dumpdir: 5 addedfile6_mv 5 linkfile6_mv_1 5 linkfile6_mv_2