On Sun, Jul 14, 2024 at 10:00:37PM +0800, Zorro Lang wrote:
> 2. Most of cases have removed '_supported_fs' line. From now on, if you don't
> need a specific white or black fs list for a case, don't need _supported_fs
> line.
A side effect of this change was that it triggered a failure in my GCE
test-appliance's regression test suite. That's because one of the
things the regression tests run is:
gce-xfstests -c ext4/4k,btrfs/4k btrfs/001 generic/001 generic/002
and previously, when testing the ext4/4k configuration, btrfs/001
would be skipped due to its "_supported_fs btrfs" line. Now, the test
is actually run, and it fails (unsurprisingly).
I'm going to work around this in my test appliance, so I'm not asking
that the change be reverted, but I thought I would point out that this
does result in a behavioural change in some corner cases.
- Ted
commit 71b003b9ad0a0f0e4bf91619702addd0bb552f7d
Author: Theodore Ts'o <tytso@xxxxxxx>
Date: Mon Jul 15 11:34:30 2024 -0400
test-appliance: exclude tests that are not supported for the file system type
This is needed due to upstream xfstests commit f2c179ef055d ("remove
spurious _supported_fs calls").
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
diff --git a/test-appliance/files/root/runtests.sh b/test-appliance/files/root/runtests.sh
index f59305b0..817d51f2 100755
--- a/test-appliance/files/root/runtests.sh
+++ b/test-appliance/files/root/runtests.sh
@@ -386,6 +386,14 @@ do
AEX="$AEX -E /tmp/exclude-tests"
fi
if test ! -f "$RESULT_BASE/tests-to-run" ; then
+ case "$BASE_FSTYPE" in
+ ext2|ext3|ext4)
+ tests_regexp="ext4"
+ ;;
+ *)
+ tests_regexp="$BASE_FSTYPE"
+ esac
+ tests_regexp="^($tests_regexp|shared|generic|perf|selftest)"
bash ./check -n $FSTESTSET >& /tmp/tests-to-run.debug
ret="$?"
echo "Exit status $ret" >> /tmp/tests-to-run.debug
@@ -396,6 +404,7 @@ do
fi
bash ./check -n $FSTESTSET 2> /dev/null | \
sed -e '1,/^$/d' -e '/^$/d' | \
+ grep -E "$tests_regexp" | \
sort > "$RESULT_BASE/tests-to-run"
nr_tests=$(wc -l < "$RESULT_BASE/tests-to-run")
if test "$nr_tests" -ne 1
