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@xxxxxxxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
