generic/398: filter out extra string from newer mv

mv command produces a leading string "renamed" from some time.
This breaks generic/398. Adding a _filter_mv to filter it out.
Tested this patch on Fedora 28.

sh-4.2$ rpm -qf /usr/bin/mv
coreutils-8.22-23.el7.x86_64
sh-4.2$ mv -v 1 2
‘1’ -> ‘2’
sh-4.2$

h-4.4# rpm -qf /usr/bin/mv
coreutils-8.30-5.el8.x86_64
sh-4.4# mv -v 1 2
renamed '1' -> '2'
sh-4.4#

igned-off-by: Xiong Murphy Zhou <xzhou@redhat.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/common/filter b/common/filter
index e87740ddda3f407ba8b8fbb3ad83646ba9545cad..ed082d246bfa589e61e2dfab9be564e5d125b5c2 100644 (file)
--- a/common/filter
+++ b/common/filter
@@ -504,6 +504,12 @@ _filter_mknod()
        sed -e "s/mknod: [\`']\(.*\)': File exists/mknod: \1: File exists/"
 }
 
+# Remove leading "rename" in "mv -v" output
+_filter_mv()
+{
+       sed -e "s/^renamed //"
+}
+
 _filter_lostfound()
 {
        sed -e '/^lost+found$/d'

diff --git a/tests/generic/398 b/tests/generic/398
index 58b54af01cf171449737ac4414d71ba245298624..efb8348c92746d85ee838ecc7b368daab5ac48c1 100755 (executable)
--- a/tests/generic/398
+++ b/tests/generic/398
@@ -95,7 +95,7 @@ ln -v $edir1/efile1 $udir/efile1 |& _filter_scratch
 rm $udir/efile1 # undo
 
 echo -e "\n*** Rename encrypted => unencrypted ***"
-mv -v $edir1/efile1 $udir/efile1 |& _filter_scratch
+mv -v $edir1/efile1 $udir/efile1 |& _filter_scratch |& _filter_mv
 mv $udir/efile1 $edir1/efile1 # undo
 
 
@@ -119,9 +119,9 @@ src/renameat2 -x $edir1/efile1 $udir/ufile |& _filter_scratch
 
 echo -e "\n\n*** Special file tests ***"
 mkfifo $edir1/fifo
-mv -v $edir1/fifo $edir2/fifo | _filter_scratch
-mv -v $edir2/fifo $udir/fifo | _filter_scratch
-mv -v $udir/fifo $edir1/fifo | _filter_scratch
+mv -v $edir1/fifo $edir2/fifo | _filter_scratch |& _filter_mv
+mv -v $edir2/fifo $udir/fifo | _filter_scratch |& _filter_mv
+mv -v $udir/fifo $edir1/fifo | _filter_scratch |& _filter_mv
 mkfifo $udir/fifo
 src/renameat2 -x $udir/fifo $edir1/fifo
 ln -v $edir1/fifo $edir2/fifo | _filter_scratch