From 840353fe0459149b1b96375b35de73a73f9f85f0 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 21 Aug 2006 03:54:04 +0000 Subject: [PATCH] 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. --- 050 | 6 +++++- 050.out | 12 ++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/050 b/050 index 37fc448f..92d372dd 100755 --- a/050 +++ b/050 @@ -51,7 +51,11 @@ ihard=10 _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 diff --git a/050.out b/050.out index 67951cb0..0c0b45b9 100644 --- a/050.out +++ b/050.out @@ -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 [--------] *** 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 [--------] *** 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 [--------] *** 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 [--------] *** 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 [--------] *** 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 [--------] *** 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 [--------] *** 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 [--------] *** 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 [--------] *** unmount -- 2.47.3