Skip to contentSkip to conversation

fix xfsqa test 052 filtering with long device names

PATCH In review Eric Sandeen 1 participant 2 messages Aug 24, 2007 – Nov 5, 2008

lore
Share & tools
lore

Eric Sandeen

author
#0 lore raw

PATCH 1/1 fix xfsqa test 052 filtering with long device names

Long devicenames cause this quota output to split onto 2 lines:

# xfs_quota -c "quota -gpu -birnN 99" /mnt/scratch
/dev/mapper/testvol-test2
                           880       1004       1004   00 [--------]           1         10         10   00 [--------]           0          0          0   00 [--------] /mnt/scratch

(why, I'm not sure, because that last line is plenty long too)

but if we make that "\n" go away, the test still passes.

Signed-off-by Eric Sandeen <[email protected]>
xfstests/052 +2 -2
Index: xfs-cmds/xfstests/052
===================================================================
@@ -82,8 +82,8 @@ xfs_quota -x \
 
 # cross check blks, softblks, hardblks <-> quota, xfs_db
 xfs_quota -c "quota -$type -birnN $id" $SCRATCH_DEV |
-			tr -s '[:space:]' | tee -a $seq.full | perl -ne '
-	if (m[^\s*'$SCRATCH_DEV'\s+(\d+)\s+(\d+)\s+(\d+)]) {
+			tr -d '\n' | tr -s '[:space:]' | tee -a $seq.full |
+	perl -ne 'if (m[^\s*'$SCRATCH_DEV'\s+(\d+)\s+(\d+)\s+(\d+)]) {
 		print "used_blocks=", $1, "\n";
 		print "soft_blocks=", $2, "\n";
 		print "hard_blocks=", $3, "\n";
author
#1 lore raw

This is still a problem and I just wasted too much time on it before I remembered the cause ... can we merge this please so I don't hit it again next year? :)

Thanks,
-Eric

-------------------------

Long devicenames cause this quota output to split onto 2 lines:

# xfs_quota -c "quota -gpu -birnN 99" /mnt/scratch
/dev/mapper/testvol-test2
                           880       1004       1004   00 [--------]           1         10         10   00 [--------]           0          0          0   00 [--------] /mnt/scratch

but if we make that "\n" go away, the test still passes.

Signed-off-by Eric Sandeen <[email protected]>
xfstests/052 +2 -2
Index: xfs-cmds/xfstests/052
===================================================================
@@ -82,8 +82,8 @@ xfs_quota -x \
 
 # cross check blks, softblks, hardblks <-> quota, xfs_db
 xfs_quota -c "quota -$type -birnN $id" $SCRATCH_DEV |
-			tr -s '[:space:]' | tee -a $seq.full | perl -ne '
-	if (m[^\s*'$SCRATCH_DEV'\s+(\d+)\s+(\d+)\s+(\d+)]) {
+			tr -d '\n' | tr -s '[:space:]' | tee -a $seq.full |
+	perl -ne 'if (m[^\s*'$SCRATCH_DEV'\s+(\d+)\s+(\d+)\s+(\d+)]) {
 		print "used_blocks=", $1, "\n";
 		print "soft_blocks=", $2, "\n";
 		print "hard_blocks=", $3, "\n";