public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: Omer Zilberberg <omzg@plexistor.com>
To: fstests@vger.kernel.org
Cc: Omer Zilberberg <omzg@plexistor.com>
Subject: [PATCH] generic/294: filter quotes from mknod
Date: Sun, 26 Jun 2016 13:47:24 +0300	[thread overview]
Message-ID: <1466938044-23916-1-git-send-email-omzg@plexistor.com> (raw)

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>
---
 common/filter         | 5 +++++
 tests/generic/294     | 2 +-
 tests/generic/294.out | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/filter b/common/filter
index 244621a..a16ef70 100644
--- a/common/filter
+++ b/common/filter
@@ -385,5 +385,10 @@ _filter_od()
 	'
 }
 
+_filter_mknod()
+{
+	sed -e "s/mknod: '\(.*\)': File exists/mknod: \1: File exists/"
+}
+
 # make sure this script returns success
 /bin/true
diff --git a/tests/generic/294 b/tests/generic/294
index 3fa6ba2..fb5d9aa 100755
--- a/tests/generic/294
+++ b/tests/generic/294
@@ -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
diff --git a/tests/generic/294.out b/tests/generic/294.out
index 1ac1c67..7802472 100644
--- a/tests/generic/294.out
+++ b/tests/generic/294.out
@@ -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
-- 
2.5.5


             reply	other threads:[~2016-06-26 10:47 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-26 10:47 Omer Zilberberg [this message]
2016-06-27  3:15 ` [PATCH] generic/294: filter quotes from mknod Eryu Guan
2016-06-27  6:57   ` Omer Zilberberg
2016-06-27 12:52     ` Omer Zilberberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1466938044-23916-1-git-send-email-omzg@plexistor.com \
    --to=omzg@plexistor.com \
    --cc=fstests@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox