From: Tim Shimmin Date: Thu, 6 Nov 2008 15:10:24 +0000 (+0000) Subject: Long devicenames cause this quota output to split onto 2 lines: X-Git-Tag: v1.1.0~353 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=dc4bae27a448ed6f02a354e33feabb40dc5dc7f9;p=xfstests-dev.git 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 Merge of master-melb:xfs-cmds:32444a by kenmcd. 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 --- diff --git a/052 b/052 index ccd3008e..156fe761 100755 --- a/052 +++ b/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";