apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfstests: unify apostrophes in output files

Browse Source 
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 <tracek@redhat.com>
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Tomas Racek
2013-09-19 16:20:37 +00:00
committed by Rich Johnston
parent d4bc9576f0
commit 774f4dd775
10 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
check
+4
View File
@@ -485,6 +485,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
common/config
+1
View File
@@ -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 :)
tests/generic/193.out
+8 -8
View File
@@ -3,28 +3,28 @@ QA output created by 193
testing ATTR_UID
user: chown root owned file to qa_user (should fail)
chown: changing ownership of `test.root': Operation not permitted
chown: changing ownership of 'test.root': Operation not permitted
user: chown root owned file to root (should fail)
chown: changing ownership of `test.root': Operation not permitted
chown: changing ownership of 'test.root': Operation not permitted
user: chown qa_user owned file to qa_user (should succeed)
user: chown qa_user owned file to root (should fail)
chown: changing ownership of `test.user': Operation not permitted
chown: changing ownership of 'test.user': Operation not permitted
testing ATTR_GID
user: chgrp root owned file to root (should fail)
chgrp: changing group of `test.root': Operation not permitted
chgrp: changing group of 'test.root': Operation not permitted
user: chgrp qa_user owned file to root (should fail)
chgrp: changing group of `test.user': Operation not permitted
chgrp: changing group of 'test.user': Operation not permitted
user: chgrp root owned file to qa_user (should fail)
chgrp: changing group of `test.root': Operation not permitted
chgrp: changing group of 'test.root': Operation not permitted
user: chgrp qa_user owned file to qa_user (should succeed)
testing ATTR_MODE
user: chmod a+r on qa_user owned file (should succeed)
user: chmod a+r on root owned file (should fail)
chmod: changing permissions of `test.root': Operation not permitted
chmod: changing permissions of 'test.root': Operation not permitted
check that the sgid bit is cleared
-rw-rw-rw-
check that suid bit is not cleared
@@ -60,5 +60,5 @@ testing ATTR_*TIMES_SET
user: touch qa_user file (should succeed)
user: touch root file (should fail)
touch: cannot touch `test.root': Permission denied
touch: cannot touch 'test.root': Permission denied
*** done
tests/generic/230.out
+4 -4
View File
@@ -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
tests/generic/235.out
+1 -1
View File
@@ -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
tests/generic/245.out
+1 -1
View File
@@ -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
tests/generic/294.out
+4 -4
View File
@@ -1,5 +1,5 @@
QA output created by 294
mknod: `SCRATCH_MNT/294.test/testnode': File exists
mkdir: cannot create directory `SCRATCH_MNT/294.test/testdir': File exists
touch: cannot touch `SCRATCH_MNT/294.test/testtarget': Read-only file system
ln: creating symbolic link `SCRATCH_MNT/294.test/testlink': File exists
mknod: 'SCRATCH_MNT/294.test/testnode': File exists
mkdir: cannot create directory 'SCRATCH_MNT/294.test/testdir': File exists
touch: cannot touch 'SCRATCH_MNT/294.test/testtarget': Read-only file system
ln: creating symbolic link 'SCRATCH_MNT/294.test/testlink': File exists
tests/generic/306.out
+1 -1
View File
@@ -1,6 +1,6 @@
QA output created by 306
== try to create new file
touch: cannot touch `SCRATCH_MNT/this_should_fail': Read-only file system
touch: cannot touch 'SCRATCH_MNT/this_should_fail': Read-only file system
== pwrite to null device
wrote 512/512 bytes at offset 0
XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
tests/xfs/103.out
+1 -1
View File
@@ -4,7 +4,7 @@ QA output created by 103
*** testing nosymlinks directories
*** setting nosymlinks bit
--n-- SCRATCH_MNT/nosymlink
ln: creating symbolic link `SCRATCH_MNT/nosymlink/target': Operation not permitted
ln: creating symbolic link 'SCRATCH_MNT/nosymlink/target': Operation not permitted
*** 1st listing...
SCRATCH_MNT
SCRATCH_MNT/nosymlink
tests/xfs/200.out
+1 -1
View File
@@ -3,7 +3,7 @@ setting device read-only
mounting read-only block device:
mount: block device SCRATCH_DEV is write-protected, mounting read-only
touching file on read-only filesystem (should fail)
touch: cannot touch `SCRATCH_MNT/foo': Read-only file system
touch: cannot touch 'SCRATCH_MNT/foo': Read-only file system
unmounting read-only filesystem
setting device read-write
mounting read-write block device: