Make test 050 output deterministic - cater for #days flipping to six (correctly), and extra space being allocated to id zero (also correctly).

Merge of master-melb:xfs-cmds:26820a by kenmcd.
This commit is contained in:
Nathan Scott
2006-08-21 03:54:04 +00:00
parent b4856f64fe
commit 840353fe04
2 changed files with 11 additions and 7 deletions
+5 -1
View File
@@ -51,7 +51,11 @@ ihard=10
_filter_report() _filter_report()
{ {
tr -s '[:space:]' | sed -e "s/^\#$id /[NAME] /g" -e "s/^#0 /[ROOT] /g" tr -s '[:space:]' | \
perl -npe '
s/^\#'$id' /[NAME] /g;
s/^\#0 \d+ /[ROOT] 0 /g;
s/6 days/7 days/g'
} }
# The actual point at which limit enforcement takes place for the # The actual point at which limit enforcement takes place for the
+6 -6
View File
@@ -87,11 +87,11 @@ realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
[NAME] 140 100 500 00 [--------] 4 4 10 00 [--------] 0 0 0 00 [--------] [NAME] 140 100 500 00 [--------] 4 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the hard inode limit (expect EDQUOT) *** push past the hard inode limit (expect EDQUOT)
[ROOT] 4 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------] [ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [--------] 16 4 10 00 [--none--] 0 0 0 00 [--------] [NAME] 140 100 500 00 [--------] 16 4 10 00 [--none--] 0 0 0 00 [--------]
*** push past the hard block limit (expect EDQUOT) *** push past the hard block limit (expect EDQUOT)
[ROOT] 4 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------] [ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 540 100 500 00 [--none--] 16 4 10 00 [--none--] 0 0 0 00 [--------] [NAME] 540 100 500 00 [--none--] 16 4 10 00 [--none--] 0 0 0 00 [--------]
*** unmount *** unmount
@@ -119,11 +119,11 @@ realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
[NAME] 140 100 500 00 [--------] 4 4 10 00 [--------] 0 0 0 00 [--------] [NAME] 140 100 500 00 [--------] 4 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the hard inode limit (expect EDQUOT) *** push past the hard inode limit (expect EDQUOT)
[ROOT] 4 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------] [ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [--------] 16 4 10 00 [--none--] 0 0 0 00 [--------] [NAME] 140 100 500 00 [--------] 16 4 10 00 [--none--] 0 0 0 00 [--------]
*** push past the hard block limit (expect EDQUOT) *** push past the hard block limit (expect EDQUOT)
[ROOT] 4 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------] [ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 540 100 500 00 [--none--] 16 4 10 00 [--none--] 0 0 0 00 [--------] [NAME] 540 100 500 00 [--none--] 16 4 10 00 [--none--] 0 0 0 00 [--------]
*** unmount *** unmount
@@ -183,11 +183,11 @@ realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
[NAME] 140 100 500 00 [--------] 4 4 10 00 [--------] 0 0 0 00 [--------] [NAME] 140 100 500 00 [--------] 4 4 10 00 [--------] 0 0 0 00 [--------]
*** push past the hard inode limit (expect EDQUOT) *** push past the hard inode limit (expect EDQUOT)
[ROOT] 4 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------] [ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 140 100 500 00 [--------] 16 4 10 00 [--none--] 0 0 0 00 [--------] [NAME] 140 100 500 00 [--------] 16 4 10 00 [--none--] 0 0 0 00 [--------]
*** push past the hard block limit (expect EDQUOT) *** push past the hard block limit (expect EDQUOT)
[ROOT] 4 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------] [ROOT] 0 0 0 00 [--------] 3 0 0 00 [--------] 0 0 0 00 [--------]
[NAME] 540 100 500 00 [--none--] 16 4 10 00 [--none--] 0 0 0 00 [--------] [NAME] 540 100 500 00 [--none--] 16 4 10 00 [--none--] 0 0 0 00 [--------]
*** unmount *** unmount