public inbox for fstests@vger.kernel.org
 help / color / mirror / Atom feed
From: "Misono, Tomohiro" <misono.tomohiro@jp.fujitsu.com>
To: fstests@vger.kernel.org
Subject: [PATCH 1/1] overlay/035: small fix for newer util-linux
Date: Tue, 14 Nov 2017 10:10:17 +0900	[thread overview]
Message-ID: <8389cef1-9d9b-a9f2-e5b7-e409e42e2df3@jp.fujitsu.com> (raw)
In-Reply-To: <7a255645-5148-cd45-c0f7-1645982ca4e9@jp.fujitsu.com>

Modify filter in order make the test run correctly for
both old (2.29) and new (2.30) util-linux.

Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>
---
 tests/overlay/035 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/overlay/035 b/tests/overlay/035
index 64fcd708..6f1627c6 100755
--- a/tests/overlay/035
+++ b/tests/overlay/035
@@ -69,7 +69,8 @@ mkdir -p $lowerdir1 $lowerdir2 $upperdir $workdir
 $MOUNT_PROG -t overlay -o"lowerdir=$lowerdir2:$lowerdir1" \
 			$OVL_BASE_SCRATCH_MNT $SCRATCH_MNT
 touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch
-_scratch_remount rw 2>&1 | _filter_scratch
+_scratch_remount rw 2>&1 | _filter_scratch \
+	| sed -e "s,SCRATCH_MNT: ,," | sed -e "s,\.$,,"
 $UMOUNT_PROG $SCRATCH_MNT
 
 # Make workdir immutable to prevent workdir re-create on mount
@@ -79,7 +80,8 @@ $CHATTR_PROG +i $workdir
 # Verify that overlay is mounted read-only and that it cannot be remounted rw.
 _overlay_scratch_mount_dirs $lowerdir2 $upperdir $workdir
 touch $SCRATCH_MNT/bar 2>&1 | _filter_scratch
-_scratch_remount rw 2>&1 | _filter_scratch
+_scratch_remount rw 2>&1 | _filter_scratch \
+	| sed -e "s,SCRATCH_MNT: ,," | sed -e "s,\.$,,"
 
 # success, all done
 status=0
-- 
2.13.6


  reply	other threads:[~2017-11-14  1:10 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-14  1:09 [PATCH 0/1] small fix for newer util-linux Misono, Tomohiro
2017-11-14  1:10 ` Misono, Tomohiro [this message]
2017-11-14  8:55   ` [PATCH 1/1] overlay/035: " Amir Goldstein
2017-11-14  9:15     ` Eryu Guan

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=8389cef1-9d9b-a9f2-e5b7-e409e42e2df3@jp.fujitsu.com \
    --to=misono.tomohiro@jp.fujitsu.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