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 <sandeen@sandeen.net>
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 <sandeen@sandeen.net>

diff --git a/052 b/052
index ccd3008ea4ec0036412af0b603d9b11d466b9f2d..156fe7614f247535d9bd43506f91676e8a5c9c57 100755 (executable)
--- 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";