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/398: filter out extra string from newer mv

Browse Source 
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>
This commit is contained in:
Xiong Murphy Zhou
2018-11-09 12:19:13 +08:00
committed by Eryu Guan
parent 96c40c9fc4
commit 3dc717c148
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/filter
+6
View File
@@ -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'
tests/generic/398
+4 -4
View File
@@ -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