mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
ls -l reports different file size depending on platform and user. Replaced with ls -s and stat.
Merge of xfs-cmds-melb:slinx:20309a by kenmcd. Changed ls -l to stat and updated filter accord.
This commit is contained in:
Andrew Jones
@@ -54,20 +54,20 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
|
||||
. ./common.filter
|
||||
. ./common.dump
|
||||
|
||||
# IRIX "ls -s" uses a block size of 512, for consistincy on linux use
|
||||
# ls --block-size=512 -s <file>
|
||||
[ $HOSTOS == Linux ] && LS_BLOCKSIZE="--block-size=512"
|
||||
|
||||
_my_ls_filter()
|
||||
{
|
||||
#
|
||||
# Print size ($5) and fname ($9).
|
||||
# Print size and fname.
|
||||
# The size is significant since we add to the file as part
|
||||
# of a file change for the incremental.
|
||||
#
|
||||
# Filter out the housekeeping files of xfsrestore
|
||||
# Filter out toplevel "dumpdir/$" report.
|
||||
#
|
||||
$AWK_PROG '
|
||||
NF == 9 && $0 ~ /dir/ { print $9; next }
|
||||
NF == 9 { print $5, $9; next }
|
||||
NF == 1 { print } ' |\
|
||||
grep -v total | grep -v "^$" | sed "s/^[ \t]*//g" | \
|
||||
sed -e 's/.*dumpdir/dumpdir/' |\
|
||||
egrep -v 'housekeeping|dirattr|dirextattr|namreg|state|tree|dumpdir/$|dumpdir:$' |\
|
||||
egrep -v "$restore_dir:"
|
||||
@@ -170,7 +170,7 @@ while [ $i -le $num_dumps ]; do
|
||||
_stable_fs
|
||||
|
||||
echo "Listing of what files we have at level $i:"
|
||||
ls -lRF $dump_dir | _my_ls_filter | tee $tmp.ls.$i
|
||||
ls -sRF $LS_BLOCKSIZE $dump_dir | _my_ls_filter | tee $tmp.ls.$i
|
||||
|
||||
dump_file=$tmp.df.level$i
|
||||
_do_dump_file -l $i
|
||||
@@ -194,8 +194,8 @@ while [ $i -le $num_dumps ]; do
|
||||
echo ""
|
||||
echo "restoring from df.level$i"
|
||||
_do_restore_file_cum -l $i
|
||||
echo "ls -lRF restore_dir"
|
||||
ls -lRF $restore_dir | _my_ls_filter |\
|
||||
echo "ls -sRF restore_dir"
|
||||
ls -sRF $LS_BLOCKSIZE $restore_dir | _my_ls_filter |\
|
||||
_check_quota_file | tee $tmp.restorals.$i
|
||||
i=`expr $i + 1`
|
||||
done
|
||||
|
||||
@@ -1,20 +1,20 @@
|
||||
QA output created by 065
|
||||
Do the incremental dumps
|
||||
Listing of what files we have at level 0:
|
||||
addeddir1/
|
||||
addeddir2/
|
||||
addeddir3/
|
||||
addeddir4/
|
||||
5 addedfile0
|
||||
5 addedfile1
|
||||
5 addedfile2
|
||||
5 addedfile3
|
||||
0 addeddir1/
|
||||
0 addeddir2/
|
||||
0 addeddir3/
|
||||
0 addeddir4/
|
||||
8 addedfile0
|
||||
8 addedfile1
|
||||
8 addedfile2
|
||||
8 addedfile3
|
||||
dumpdir/addeddir1:
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir3:
|
||||
5 addedfile4
|
||||
8 addedfile4
|
||||
dumpdir/addeddir4:
|
||||
5 addedfile5
|
||||
8 addedfile5
|
||||
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 +40,14 @@ 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:
|
||||
addeddir1/
|
||||
addeddir4/
|
||||
5 addedfile0
|
||||
5 addedfile1
|
||||
5 addedfile3
|
||||
0 addeddir1/
|
||||
0 addeddir4/
|
||||
8 addedfile0
|
||||
8 addedfile1
|
||||
8 addedfile3
|
||||
dumpdir/addeddir1:
|
||||
dumpdir/addeddir4:
|
||||
5 addedfile5
|
||||
8 addedfile5
|
||||
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 +72,14 @@ 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:
|
||||
addeddir2/
|
||||
addeddir6/
|
||||
5 addedfile0
|
||||
5 addedfile2
|
||||
5 addedfile3
|
||||
0 addeddir2/
|
||||
0 addeddir6/
|
||||
8 addedfile0
|
||||
8 addedfile2
|
||||
8 addedfile3
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir6:
|
||||
5 addedfile4
|
||||
8 addedfile4
|
||||
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 +104,18 @@ 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:
|
||||
addeddir2/
|
||||
addeddir6/
|
||||
5 addedfile0
|
||||
5 addedfile2
|
||||
5 addedfile3
|
||||
5 linkfile0
|
||||
5 linkfile0_1
|
||||
5 linkfile2
|
||||
5 linkfile64
|
||||
0 addeddir2/
|
||||
0 addeddir6/
|
||||
8 addedfile0
|
||||
8 addedfile2
|
||||
8 addedfile3
|
||||
8 linkfile0
|
||||
8 linkfile0_1
|
||||
8 linkfile2
|
||||
8 linkfile64
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir6:
|
||||
5 addedfile4
|
||||
8 addedfile4
|
||||
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,12 +140,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:
|
||||
addeddir2/
|
||||
addeddir6/
|
||||
5 addedfile0
|
||||
5 addedfile3
|
||||
5 linkfile0_1
|
||||
5 linkfile2
|
||||
0 addeddir2/
|
||||
0 addeddir6/
|
||||
8 addedfile0
|
||||
8 addedfile3
|
||||
8 linkfile0_1
|
||||
8 linkfile2
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir6:
|
||||
Dumping to file...
|
||||
@@ -172,10 +172,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:
|
||||
5 addedfile6
|
||||
5 linkfile6_1
|
||||
5 linkfile6_2
|
||||
5 linkfile6_3
|
||||
8 addedfile6
|
||||
8 linkfile6_1
|
||||
8 linkfile6_2
|
||||
8 linkfile6_3
|
||||
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 +200,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:
|
||||
5 addedfile6_mv
|
||||
5 linkfile6_mv_1
|
||||
5 linkfile6_mv_2
|
||||
5 linkfile6_mv_3
|
||||
8 addedfile6_mv
|
||||
8 linkfile6_mv_1
|
||||
8 linkfile6_mv_2
|
||||
8 linkfile6_mv_3
|
||||
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 +228,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:
|
||||
5 addedfile6_mv
|
||||
5 linkfile6_mv_1
|
||||
5 linkfile6_mv_2
|
||||
5 linkfile6_mv_3
|
||||
8 addedfile6_mv
|
||||
8 linkfile6_mv_1
|
||||
8 linkfile6_mv_2
|
||||
8 linkfile6_mv_3
|
||||
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 +256,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:
|
||||
5 addedfile6_mv
|
||||
5 linkfile6_mv_1
|
||||
5 linkfile6_mv_2
|
||||
5 linkfile6_mv_3
|
||||
8 addedfile6_mv
|
||||
8 linkfile6_mv_1
|
||||
8 linkfile6_mv_2
|
||||
8 linkfile6_mv_3
|
||||
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 +578,21 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -lRF restore_dir
|
||||
addeddir1/
|
||||
addeddir2/
|
||||
addeddir3/
|
||||
addeddir4/
|
||||
5 addedfile0
|
||||
5 addedfile1
|
||||
5 addedfile2
|
||||
5 addedfile3
|
||||
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:
|
||||
5 addedfile4
|
||||
8 addedfile4
|
||||
dumpdir/addeddir4:
|
||||
5 addedfile5
|
||||
8 addedfile5
|
||||
|
||||
restoring from df.level1
|
||||
Restoring cumumlative from file...
|
||||
@@ -619,15 +619,15 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -lRF restore_dir
|
||||
addeddir1/
|
||||
addeddir4/
|
||||
5 addedfile0
|
||||
5 addedfile1
|
||||
5 addedfile3
|
||||
ls -sRF restore_dir
|
||||
0 addeddir1/
|
||||
0 addeddir4/
|
||||
8 addedfile0
|
||||
8 addedfile1
|
||||
8 addedfile3
|
||||
dumpdir/addeddir1:
|
||||
dumpdir/addeddir4:
|
||||
5 addedfile5
|
||||
8 addedfile5
|
||||
|
||||
restoring from df.level2
|
||||
Restoring cumumlative from file...
|
||||
@@ -654,15 +654,15 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -lRF restore_dir
|
||||
addeddir2/
|
||||
addeddir6/
|
||||
5 addedfile0
|
||||
5 addedfile2
|
||||
5 addedfile3
|
||||
ls -sRF restore_dir
|
||||
0 addeddir2/
|
||||
0 addeddir6/
|
||||
8 addedfile0
|
||||
8 addedfile2
|
||||
8 addedfile3
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir6:
|
||||
5 addedfile4
|
||||
8 addedfile4
|
||||
|
||||
restoring from df.level3
|
||||
Restoring cumumlative from file...
|
||||
@@ -689,19 +689,19 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -lRF restore_dir
|
||||
addeddir2/
|
||||
addeddir6/
|
||||
5 addedfile0
|
||||
5 addedfile2
|
||||
5 addedfile3
|
||||
5 linkfile0
|
||||
5 linkfile0_1
|
||||
5 linkfile2
|
||||
5 linkfile64
|
||||
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:
|
||||
5 addedfile4
|
||||
8 addedfile4
|
||||
|
||||
restoring from df.level4
|
||||
Restoring cumumlative from file...
|
||||
@@ -728,13 +728,13 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -lRF restore_dir
|
||||
addeddir2/
|
||||
addeddir6/
|
||||
5 addedfile0
|
||||
5 addedfile3
|
||||
5 linkfile0_1
|
||||
5 linkfile2
|
||||
ls -sRF restore_dir
|
||||
0 addeddir2/
|
||||
0 addeddir6/
|
||||
8 addedfile0
|
||||
8 addedfile3
|
||||
8 linkfile0_1
|
||||
8 linkfile2
|
||||
dumpdir/addeddir2:
|
||||
dumpdir/addeddir6:
|
||||
|
||||
@@ -763,11 +763,11 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -lRF restore_dir
|
||||
5 addedfile6
|
||||
5 linkfile6_1
|
||||
5 linkfile6_2
|
||||
5 linkfile6_3
|
||||
ls -sRF restore_dir
|
||||
8 addedfile6
|
||||
8 linkfile6_1
|
||||
8 linkfile6_2
|
||||
8 linkfile6_3
|
||||
|
||||
restoring from df.level6
|
||||
Restoring cumumlative from file...
|
||||
@@ -794,11 +794,11 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -lRF restore_dir
|
||||
5 addedfile6_mv
|
||||
5 linkfile6_mv_1
|
||||
5 linkfile6_mv_2
|
||||
5 linkfile6_mv_3
|
||||
ls -sRF restore_dir
|
||||
8 addedfile6_mv
|
||||
8 linkfile6_mv_1
|
||||
8 linkfile6_mv_2
|
||||
8 linkfile6_mv_3
|
||||
|
||||
restoring from df.level7
|
||||
Restoring cumumlative from file...
|
||||
@@ -825,11 +825,11 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -lRF restore_dir
|
||||
5 addedfile6_mv
|
||||
5 linkfile6_mv_1
|
||||
5 linkfile6_mv_2
|
||||
5 linkfile6_mv_3
|
||||
ls -sRF restore_dir
|
||||
8 addedfile6_mv
|
||||
8 linkfile6_mv_1
|
||||
8 linkfile6_mv_2
|
||||
8 linkfile6_mv_3
|
||||
|
||||
restoring from df.level8
|
||||
Restoring cumumlative from file...
|
||||
@@ -856,11 +856,11 @@ xfsrestore: directory post-processing
|
||||
xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls -lRF restore_dir
|
||||
5 addedfile6_mv
|
||||
5 linkfile6_mv_1
|
||||
5 linkfile6_mv_2
|
||||
5 linkfile6_mv_3
|
||||
ls -sRF restore_dir
|
||||
8 addedfile6_mv
|
||||
8 linkfile6_mv_1
|
||||
8 linkfile6_mv_2
|
||||
8 linkfile6_mv_3
|
||||
|
||||
Do the ls comparison
|
||||
Comparing ls of FS with restored FS at level 0
|
||||
|
||||
@@ -64,9 +64,9 @@ _supported_os IRIX Linux
|
||||
|
||||
_setup_testdir
|
||||
|
||||
_my_ls_filter()
|
||||
_my_stat_filter()
|
||||
{
|
||||
$AWK_PROG 'NF > 5 {print $5, $9}'
|
||||
grep "[sS]ize" | sed "s/.*[sS]ize[: ]*\([[:digit:]]*\).*/\1 largefile/g"
|
||||
}
|
||||
|
||||
rm -f $testdir/testfile
|
||||
@@ -78,11 +78,11 @@ fi
|
||||
|
||||
_create_dumpdir_largefile
|
||||
echo "ls dumpdir/largefile"
|
||||
ls -l $dump_dir | _my_ls_filter
|
||||
stat $dump_dir | _my_stat_filter
|
||||
_do_dump_file
|
||||
_do_restore_file
|
||||
echo "ls restoredir/largefile"
|
||||
ls -l $restore_dir/$dump_sdir | _my_ls_filter
|
||||
stat $restore_dir/$dump_sdir | _my_stat_filter
|
||||
|
||||
# success, all done
|
||||
status=0
|
||||
|
||||
@@ -3,7 +3,7 @@ dd a largefile at offset 4294967297
|
||||
10+0 records in
|
||||
10+0 records out
|
||||
ls dumpdir/largefile
|
||||
4294967307 largefile
|
||||
22 largefile
|
||||
Dumping to file...
|
||||
xfsdump -f DUMP_FILE -M stress_tape_media -L stress_066 SCRATCH_MNT
|
||||
xfsdump: using file dump (drive_simple) strategy
|
||||
@@ -41,4 +41,4 @@ xfsrestore: restoring non-directory files
|
||||
xfsrestore: restore complete: SECS seconds elapsed
|
||||
xfsrestore: Restore Status: SUCCESS
|
||||
ls restoredir/largefile
|
||||
4294967307 largefile
|
||||
22 largefile
|
||||
|
||||
Reference in New Issue
Block a user