From 9df68474ff450d126396d8581e6be033c78c28ad Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 30 Oct 2015 08:59:04 -0700 Subject: [PATCH] Pickup upstream xfstest fix Until we can refresh xfstests to the last version we need to pull in the following upstream change to resolve false positives for a few test cases. See upstream commit 774f4dd775340adc53565dce858882de0d4e6e85 xfstests: unify apostrophes in output files With coreutils v8.16 the style of apostrophes changed from `word' to 'word'. This is breaking some tests which use the older form. This commit introduces function changes the golden output of the affected tests and introduces a filter for the older style output. [dchinner: modified to use a global filter in check rather than per-test filters] [rjohnston: minor comment change] Signed-off-by: Tomas Racek Signed-off-by: Dave Chinner Reviewed-by: Eric Sandeen Signed-off-by: Rich Johnston --- 230.out | 8 ++++---- 235.out | 2 +- 245.out | 2 +- check | 4 ++++ common.config | 1 + 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/230.out b/230.out index d2d434c80..c3dace986 100644 --- a/230.out +++ b/230.out @@ -12,9 +12,9 @@ Write 4096... pwrite64: Disk quota exceeded Touch 3+4 Touch 5+6 -touch: cannot touch `SCRATCH_MNT/file6': Disk quota exceeded +touch: cannot touch 'SCRATCH_MNT/file6': Disk quota exceeded Touch 5 -touch: cannot touch `SCRATCH_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 `SCRATCH_MNT/file6': Disk quota exceeded +touch: cannot touch 'SCRATCH_MNT/file6': Disk quota exceeded Touch 5 -touch: cannot touch `SCRATCH_MNT/file5': Disk quota exceeded +touch: cannot touch 'SCRATCH_MNT/file5': Disk quota exceeded diff --git a/235.out b/235.out index 345e29d68..71eb4de66 100644 --- a/235.out +++ b/235.out @@ -15,7 +15,7 @@ Group used soft hard grace used soft hard grace fsgqa -- 0 0 0 1 0 0 -touch: cannot touch `SCRATCH_MNT/failed': Read-only file system +touch: cannot touch 'SCRATCH_MNT/failed': Read-only file system *** Report for user quotas on device SCRATCH_DEV Block grace time: 7days; Inode grace time: 7days Block limits File limits diff --git a/245.out b/245.out index 8322aac29..f5b5f1826 100644 --- a/245.out +++ b/245.out @@ -1,2 +1,2 @@ QA output created by 245 -mv: cannot move `TEST_DIR/test-mv/ab/aa/' to `TEST_DIR/test-mv/aa': File exists +mv: cannot move 'TEST_DIR/test-mv/ab/aa/' to 'TEST_DIR/test-mv/aa': File exists diff --git a/check b/check index f7920097d..0c7900e76 100755 --- a/check +++ b/check @@ -273,6 +273,10 @@ do echo " - no qualified output" err=true else + + # coreutils 8.16+ changed quote formats in error messages from + # `foo' to 'foo'. Filter old versions to match the new version. + sed -i "s/\`/\'/g" $tmp.out if diff $seq.out $tmp.out >/dev/null 2>&1 then if $err diff --git a/common.config b/common.config index bf0802d52..31d6b6e9a 100644 --- a/common.config +++ b/common.config @@ -49,6 +49,7 @@ # all tests should use a common language setting to prevent golden # output mismatches. export LANG=C +export LC_ALL=C # Warning: don't put freeware before /usr/bsd on IRIX coz you'll # get the wrong hostname and set your system name to -s :)