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

generic/294: filter quotes from mknod

Browse Source 
Since coreutils v8.25, mknod errors omit quotes around filenames,
and this breaks generic/294's golden image.

Checked on Ubuntu 16.04.

See coreutils: 08e8fd7 all: avoid quoting file names when possible
https://github.com/coreutils/coreutils/commit/08e8fd7e38f2dae7c69c54eb22d508b6517e66e5

Signed-off-by: Omer Zilberberg <omzg@plexistor.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Omer Zilberberg
2016-06-27 15:53:28 +03:00
committed by Eryu Guan
parent 54774d4bb5
commit 78f071b949
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/filter
+7
View File
@@ -385,5 +385,12 @@ _filter_od()
'
}
# Remove quotes from failed mknod calls. Starting with Coreutils v8.25,
# mknod errors print unquoted filenames
_filter_mknod()
{
sed -e "s/mknod: '\(.*\)': File exists/mknod: \1: File exists/"
}
# make sure this script returns success
/bin/true
tests/generic/294
+1 -1
View File
@@ -55,7 +55,7 @@ THIS_TEST_DIR=$SCRATCH_MNT/$seq.test
_create_files()
{
mknod $THIS_TEST_DIR/testnode c 1 3
mknod $THIS_TEST_DIR/testnode c 1 3 2>&1 | _filter_mknod
mkdir $THIS_TEST_DIR/testdir
touch $THIS_TEST_DIR/testtarget
ln -s $THIS_TEST_DIR/testtarget $THIS_TEST_DIR/testlink 2>&1 | _filter_ln
tests/generic/294.out
+1 -1
View File
@@ -1,5 +1,5 @@
QA output created by 294
mknod: 'SCRATCH_MNT/294.test/testnode': 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