mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
Stop using ls for comparison with dump/restore for 065 and instead
use find with src/lstat64. Should convert other tests in the future. Merge of master-melb:xfs-cmds:24773a by kenmcd. Stop using ls for comparison with dump/restore for 065 and instead use find with src/lstat64. Should convert other tests in the future.
This commit is contained in:
Tim Shimmin
@@ -1,20 +1,16 @@
|
||||
QA output created by 065
|
||||
Do the incremental dumps
|
||||
Listing of what files we have at level 0:
|
||||
0 addeddir1/
|
||||
0 addeddir2/
|
||||
0 addeddir3/
|
||||
0 addeddir4/
|
||||
8 addedfile0
|
||||
8 addedfile1
|
||||
8 addedfile2
|
||||
8 addedfile3
|
||||
dumpdir/addeddir1:
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir3:
|
||||
8 addedfile4
|
||||
dumpdir/addeddir4:
|
||||
8 addedfile5
|
||||
dumpdir/addeddir1 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir2 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir3/addedfile4 5 -rw-r--r-- 0,0
|
||||
dumpdir/addeddir3 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir4/addedfile5 5 -rw-r--r-- 0,0
|
||||
dumpdir/addeddir4 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addedfile0 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile1 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile2 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile3 5 -rw-r--r-- 0,0
|
||||
Dumping to file...
|
||||
xfsdump -l0 -f DUMP_FILE -M stress_tape_media -L stress_065 SCRATCH_MNT
|
||||
xfsdump: using file dump (drive_simple) strategy
|
||||
@@ -40,14 +36,12 @@ 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:
|
||||
0 addeddir1/
|
||||
0 addeddir4/
|
||||
8 addedfile0
|
||||
8 addedfile1
|
||||
8 addedfile3
|
||||
dumpdir/addeddir1:
|
||||
dumpdir/addeddir4:
|
||||
8 addedfile5
|
||||
dumpdir/addeddir1 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir4/addedfile5 5 -rw-r--r-- 0,0
|
||||
dumpdir/addeddir4 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addedfile0 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile1 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile3 5 -rw-r--r-- 0,0
|
||||
Dumping to file...
|
||||
xfsdump -l1 -f DUMP_FILE -M stress_tape_media -L stress_065 SCRATCH_MNT
|
||||
xfsdump: using file dump (drive_simple) strategy
|
||||
@@ -72,14 +66,12 @@ 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:
|
||||
0 addeddir2/
|
||||
0 addeddir6/
|
||||
8 addedfile0
|
||||
8 addedfile2
|
||||
8 addedfile3
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir6:
|
||||
8 addedfile4
|
||||
dumpdir/addeddir2 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir6/addedfile4 5 -rw-r--r-- 0,0
|
||||
dumpdir/addeddir6 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addedfile0 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile2 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile3 5 -rw-r--r-- 0,0
|
||||
Dumping to file...
|
||||
xfsdump -l2 -f DUMP_FILE -M stress_tape_media -L stress_065 SCRATCH_MNT
|
||||
xfsdump: using file dump (drive_simple) strategy
|
||||
@@ -104,18 +96,16 @@ 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:
|
||||
0 addeddir2/
|
||||
0 addeddir6/
|
||||
8 addedfile0
|
||||
8 addedfile2
|
||||
8 addedfile3
|
||||
8 linkfile0
|
||||
8 linkfile0_1
|
||||
8 linkfile2
|
||||
8 linkfile64
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir6:
|
||||
8 addedfile4
|
||||
dumpdir/addeddir2 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir6/addedfile4 5 -rw-r--r-- 0,0
|
||||
dumpdir/addeddir6 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addedfile0 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile2 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile3 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile0_1 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile0 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile2 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile64 5 -rw-r--r-- 0,0
|
||||
Dumping to file...
|
||||
xfsdump -l3 -f DUMP_FILE -M stress_tape_media -L stress_065 SCRATCH_MNT
|
||||
xfsdump: using file dump (drive_simple) strategy
|
||||
@@ -140,14 +130,12 @@ 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:
|
||||
0 addeddir2/
|
||||
0 addeddir6/
|
||||
8 addedfile0
|
||||
8 addedfile3
|
||||
8 linkfile0_1
|
||||
8 linkfile2
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir6:
|
||||
dumpdir/addeddir2 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir6 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addedfile0 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile3 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile0_1 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile2 5 -rw-r--r-- 0,0
|
||||
Dumping to file...
|
||||
xfsdump -l4 -f DUMP_FILE -M stress_tape_media -L stress_065 SCRATCH_MNT
|
||||
xfsdump: using file dump (drive_simple) strategy
|
||||
@@ -172,10 +160,10 @@ 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:
|
||||
8 addedfile6
|
||||
8 linkfile6_1
|
||||
8 linkfile6_2
|
||||
8 linkfile6_3
|
||||
dumpdir/addedfile6 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_1 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_2 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_3 5 -rw-r--r-- 0,0
|
||||
Dumping to file...
|
||||
xfsdump -l5 -f DUMP_FILE -M stress_tape_media -L stress_065 SCRATCH_MNT
|
||||
xfsdump: using file dump (drive_simple) strategy
|
||||
@@ -200,10 +188,10 @@ 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:
|
||||
8 addedfile6_mv
|
||||
8 linkfile6_mv_1
|
||||
8 linkfile6_mv_2
|
||||
8 linkfile6_mv_3
|
||||
dumpdir/addedfile6_mv 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_1 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_2 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_3 5 -rw-r--r-- 0,0
|
||||
Dumping to file...
|
||||
xfsdump -l6 -f DUMP_FILE -M stress_tape_media -L stress_065 SCRATCH_MNT
|
||||
xfsdump: using file dump (drive_simple) strategy
|
||||
@@ -228,10 +216,10 @@ 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:
|
||||
8 addedfile6_mv
|
||||
8 linkfile6_mv_1
|
||||
8 linkfile6_mv_2
|
||||
8 linkfile6_mv_3
|
||||
dumpdir/addedfile6_mv 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_1 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_2 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_3 5 -rw-r--r-- 0,0
|
||||
Dumping to file...
|
||||
xfsdump -l7 -f DUMP_FILE -M stress_tape_media -L stress_065 SCRATCH_MNT
|
||||
xfsdump: using file dump (drive_simple) strategy
|
||||
@@ -256,10 +244,10 @@ 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:
|
||||
8 addedfile6_mv
|
||||
8 linkfile6_mv_1
|
||||
8 linkfile6_mv_2
|
||||
8 linkfile6_mv_3
|
||||
dumpdir/addedfile6_mv 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_1 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_2 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_3 5 -rw-r--r-- 0,0
|
||||
Dumping to file...
|
||||
xfsdump -l8 -f DUMP_FILE -M stress_tape_media -L stress_065 SCRATCH_MNT
|
||||
xfsdump: using file dump (drive_simple) strategy
|
||||
@@ -578,21 +566,17 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -sRF restore_dir
|
||||
0 addeddir1/
|
||||
0 addeddir2/
|
||||
0 addeddir3/
|
||||
0 addeddir4/
|
||||
8 addedfile0
|
||||
8 addedfile1
|
||||
8 addedfile2
|
||||
8 addedfile3
|
||||
dumpdir/addeddir1:
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir3:
|
||||
8 addedfile4
|
||||
dumpdir/addeddir4:
|
||||
8 addedfile5
|
||||
list restore_dir
|
||||
dumpdir/addeddir1 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir2 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir3/addedfile4 5 -rw-r--r-- 0,0
|
||||
dumpdir/addeddir3 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir4/addedfile5 5 -rw-r--r-- 0,0
|
||||
dumpdir/addeddir4 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addedfile0 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile1 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile2 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile3 5 -rw-r--r-- 0,0
|
||||
|
||||
restoring from df.level1
|
||||
Restoring cumumlative from file...
|
||||
@@ -619,15 +603,13 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -sRF restore_dir
|
||||
0 addeddir1/
|
||||
0 addeddir4/
|
||||
8 addedfile0
|
||||
8 addedfile1
|
||||
8 addedfile3
|
||||
dumpdir/addeddir1:
|
||||
dumpdir/addeddir4:
|
||||
8 addedfile5
|
||||
list restore_dir
|
||||
dumpdir/addeddir1 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir4/addedfile5 5 -rw-r--r-- 0,0
|
||||
dumpdir/addeddir4 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addedfile0 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile1 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile3 5 -rw-r--r-- 0,0
|
||||
|
||||
restoring from df.level2
|
||||
Restoring cumumlative from file...
|
||||
@@ -654,15 +636,13 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -sRF restore_dir
|
||||
0 addeddir2/
|
||||
0 addeddir6/
|
||||
8 addedfile0
|
||||
8 addedfile2
|
||||
8 addedfile3
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir6:
|
||||
8 addedfile4
|
||||
list restore_dir
|
||||
dumpdir/addeddir2 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir6/addedfile4 5 -rw-r--r-- 0,0
|
||||
dumpdir/addeddir6 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addedfile0 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile2 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile3 5 -rw-r--r-- 0,0
|
||||
|
||||
restoring from df.level3
|
||||
Restoring cumumlative from file...
|
||||
@@ -689,19 +669,17 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -sRF restore_dir
|
||||
0 addeddir2/
|
||||
0 addeddir6/
|
||||
8 addedfile0
|
||||
8 addedfile2
|
||||
8 addedfile3
|
||||
8 linkfile0
|
||||
8 linkfile0_1
|
||||
8 linkfile2
|
||||
8 linkfile64
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir6:
|
||||
8 addedfile4
|
||||
list restore_dir
|
||||
dumpdir/addeddir2 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir6/addedfile4 5 -rw-r--r-- 0,0
|
||||
dumpdir/addeddir6 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addedfile0 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile2 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile3 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile0_1 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile0 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile2 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile64 5 -rw-r--r-- 0,0
|
||||
|
||||
restoring from df.level4
|
||||
Restoring cumumlative from file...
|
||||
@@ -728,15 +706,13 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -sRF restore_dir
|
||||
0 addeddir2/
|
||||
0 addeddir6/
|
||||
8 addedfile0
|
||||
8 addedfile3
|
||||
8 linkfile0_1
|
||||
8 linkfile2
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir6:
|
||||
list restore_dir
|
||||
dumpdir/addeddir2 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addeddir6 XXX drwxr-xr-x 0,0
|
||||
dumpdir/addedfile0 5 -rw-r--r-- 0,0
|
||||
dumpdir/addedfile3 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile0_1 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile2 5 -rw-r--r-- 0,0
|
||||
|
||||
restoring from df.level5
|
||||
Restoring cumumlative from file...
|
||||
@@ -763,11 +739,11 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -sRF restore_dir
|
||||
8 addedfile6
|
||||
8 linkfile6_1
|
||||
8 linkfile6_2
|
||||
8 linkfile6_3
|
||||
list restore_dir
|
||||
dumpdir/addedfile6 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_1 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_2 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_3 5 -rw-r--r-- 0,0
|
||||
|
||||
restoring from df.level6
|
||||
Restoring cumumlative from file...
|
||||
@@ -794,11 +770,11 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -sRF restore_dir
|
||||
8 addedfile6_mv
|
||||
8 linkfile6_mv_1
|
||||
8 linkfile6_mv_2
|
||||
8 linkfile6_mv_3
|
||||
list restore_dir
|
||||
dumpdir/addedfile6_mv 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_1 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_2 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_3 5 -rw-r--r-- 0,0
|
||||
|
||||
restoring from df.level7
|
||||
Restoring cumumlative from file...
|
||||
@@ -825,11 +801,11 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -sRF restore_dir
|
||||
8 addedfile6_mv
|
||||
8 linkfile6_mv_1
|
||||
8 linkfile6_mv_2
|
||||
8 linkfile6_mv_3
|
||||
list restore_dir
|
||||
dumpdir/addedfile6_mv 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_1 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_2 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_3 5 -rw-r--r-- 0,0
|
||||
|
||||
restoring from df.level8
|
||||
Restoring cumumlative from file...
|
||||
@@ -856,11 +832,11 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -sRF restore_dir
|
||||
8 addedfile6_mv
|
||||
8 linkfile6_mv_1
|
||||
8 linkfile6_mv_2
|
||||
8 linkfile6_mv_3
|
||||
list restore_dir
|
||||
dumpdir/addedfile6_mv 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_1 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_2 5 -rw-r--r-- 0,0
|
||||
dumpdir/linkfile6_mv_3 5 -rw-r--r-- 0,0
|
||||
|
||||
Do the ls comparison
|
||||
Comparing ls of FS with restored FS at level 0
|
||||
|
||||
Reference in New Issue
Block a user