xfstests: use a common _filter_scratch function

There are a number of tests that use a shell function called
"filter_scratch" or "_filter_scratch" in order to have the actual
scratch device or mount point show up in test output with a symbolic
name.  There are two sets, each following a slightly different
convention.  Put a common _filter_scratch function definition in
"common.filter" and have all test scripts use that instead.
Choosing one of the two conventions meant that a few test output
files had to be changed.

In addition, add a call to _filter_scratch to test 185, and update
its output accordingly.

Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Alex Elder
2010-10-21 19:00:08 +00:00
parent bd77e7c5bf
commit 580b0a9386
19 changed files with 90 additions and 162 deletions
+4 -4
View File
@@ -12,9 +12,9 @@ Write 4096...
pwrite64: Disk quota exceeded
Touch 3+4
Touch 5+6
touch: cannot touch `[SCR_MNT]/file6': Disk quota exceeded
touch: cannot touch `SCRATCH_MNT/file6': Disk quota exceeded
Touch 5
touch: cannot touch `[SCR_MNT]/file5': Disk quota exceeded
touch: cannot touch `SCRATCH_MNT/file5': Disk quota exceeded
### test group limit enforcement
@@ -28,6 +28,6 @@ Write 4096...
pwrite64: Disk quota exceeded
Touch 3+4
Touch 5+6
touch: cannot touch `[SCR_MNT]/file6': Disk quota exceeded
touch: cannot touch `SCRATCH_MNT/file6': Disk quota exceeded
Touch 5
touch: cannot touch `[SCR_MNT]/file5': Disk quota exceeded
touch: cannot touch `SCRATCH_MNT/file5': Disk quota exceeded