generic/565: change to use filter _filter_testdir_and_scratch
authorYongcheng Yang <yongcheng.yang@gmail.com>
Fri, 3 Apr 2020 00:32:31 +0000 (08:32 +0800)
committerEryu Guan <guaneryu@gmail.com>
Mon, 6 Apr 2020 12:38:43 +0000 (20:38 +0800)
If $TEST_DIR is a substring of $SCRATCH_MNT (like /mnt and /mnt2),
this test always fail. Change to use _filter_testdir_and_scratch
which will filter the longer string first if the other string is a
substring of the longer one.

Signed-off-by: Yongcheng Yang <yongcheng.yang@gmail.com>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
tests/generic/565

index 39eb20c8d669b3241d79e0329c6ab39d9569c9b7..41d85b919553a57087072b4ca65c43e5684dbbaa 100755 (executable)
@@ -57,7 +57,7 @@ echo $testio | grep -q "cross-device" && \
 echo -n $testio
 cmp $testdir/file $SCRATCH_MNT/copy
 echo "md5sums after xdev copy:"
-md5sum $testdir/file $SCRATCH_MNT/copy | _filter_test_dir | _filter_scratch
+md5sum $testdir/file $SCRATCH_MNT/copy | _filter_testdir_and_scratch
 
 # success, all done
 status=0