FS/XFS testing framework
 help / color / mirror / Atom feed
From: Yongcheng Yang <yongcheng.yang@gmail.com>
To: fstests@vger.kernel.org
Cc: Amir Goldstein <amir73il@gmail.com>,
	Yongcheng Yang <yongcheng.yang@gmail.com>
Subject: [PATCH] generic/565: change to use filter _filter_testdir_and_scratch
Date: Fri,  3 Apr 2020 08:32:31 +0800	[thread overview]
Message-ID: <20200403003231.25098-1-yongcheng.yang@gmail.com> (raw)

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>
---

Previously it failed with 565.out.bad:
~~~
QA output created by 565
md5sums after xdev copy:
81615449a98aaaad8dc179b3bec87f38  TEST_DIR/test-565/file
81615449a98aaaad8dc179b3bec87f38  TEST_DIR2/copy
~~~

It can pass with this patch:
~~~
[09:18:16 root@ /var/lib/xfstests]# DIFF_LENGTH=-0 ./check -nfs generic/565
FSTYP         -- nfs
PLATFORM      -- Linux/x86_64 kvm-guest 4.18.0-193.el8.x86_64 #1 SMP Fri Mar 27 14:35:58 UTC 2020
MKFS_OPTIONS  -- test-machine.com:/export-xfstests/dir2
MOUNT_OPTIONS -- -overs=4 -o context=system_u:object_r:root_t:s0 test-machine.com:/export-xfstests/dir2 /mnt/nfsmp2

generic/565	 10s
Ran: generic/565
Passed all 1 tests
~~~

Thanks,
Yongcheng

 tests/generic/565 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/generic/565 b/tests/generic/565
index 39eb20c8..41d85b91 100755
--- a/tests/generic/565
+++ b/tests/generic/565
@@ -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
-- 
2.20.1


             reply	other threads:[~2020-04-03  0:32 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-03  0:32 Yongcheng Yang [this message]
2020-04-03  3:49 ` [PATCH] generic/565: change to use filter _filter_testdir_and_scratch Zorro Lang

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=20200403003231.25098-1-yongcheng.yang@gmail.com \
    --to=yongcheng.yang@gmail.com \
    --cc=amir73il@gmail.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