Skip to contentSkip to conversation

generic/565: change to use filter _filter_testdir_and_scratch

PATCH In review Yongcheng Yang 2 participants 2 messages Apr 3, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 generic/565: change to use filter _filter_testdir_and_scratch

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.

---

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(-)
tests/generic/565 +1 -1
index 39eb20c8..41d85b91 100755
@@ -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
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 40 lines · Yongcheng Yang

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.

---

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(-)
tests/generic/565 +0 -0
index 39eb20c8..41d85b91 100755

tests/generic/565 echo $testio | grep -q "cross-device" && \ · line 60

Quoted 5 lines
tests/generic/565 +1 -1
@@ -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

Looks good to me.

If a case need to filter scratch and test together, it really need to use _filter_testdir_and_scratch. I've check all xfstests cases:

  $ grep -rsn _filter_scratch tests/|grep _filter_test
  tests/generic/565:60:md5sum $testdir/file $SCRATCH_MNT/copy | _filter_test_dir | _filter_scratch

Good news is only g/565 use _filter_test_dir and _filter_scratch together now. So we don't need to change other cases likes this patch.

Thanks,
Zorro

Quoted 6 lines
tests/generic/565 +0 -0
 # success, all done
 status=0
Signature · 1 line
2.20.1