patches: Add xfstests patches for NFS

- Disable slow-running generic/531
- Fix parallel instances
- Add an "nfsquick" group for virtual bake-a-thon testing

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Anna Schumaker 2022-01-27 09:56:45 -05:00
parent 50fcd690ba
commit 1fd4a0cf7c
3 changed files with 2915 additions and 0 deletions

View File

@ -0,0 +1,60 @@
From 9a035433e54362015a8e2f2acff85e7f658b0400 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna.Schumaker@Netapp.com>
Date: Mon, 12 Jul 2021 11:57:51 -0400
Subject: [PATCH 1/3] generic/531: Disable on NFS
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
common/rc | 15 +++++++++++++++
tests/generic/531 | 2 ++
2 files changed, 17 insertions(+)
diff --git a/common/rc b/common/rc
index a419b3ba53f6..91f0fc7b555c 100644
--- a/common/rc
+++ b/common/rc
@@ -1535,6 +1535,21 @@ _supported_fs()
_notrun "not suitable for this filesystem type: $FSTYP"
}
+# tests whether $FSTYP is one of the unsupported filesystems for a test
+#
+_unsupported_fs()
+{
+ local f
+
+ for f
+ do
+ if [ "$f" = "$FSTYP" -o "$f" = "generic" ]
+ then
+ _notrun "not suitable for this filesystem type: $FSTYP"
+ fi
+ done
+}
+
# check if a FS on a device is mounted
# if so, verify that it is mounted on mount point
# if fstype is given as argument, verify that it is also
diff --git a/tests/generic/531 b/tests/generic/531
index 5e84ca977b44..3a696a526bde 100755
--- a/tests/generic/531
+++ b/tests/generic/531
@@ -19,6 +19,7 @@ testfile=$TEST_DIR/$seq.txt
# real QA test starts here
_supported_fs generic
+_unsupported_fs nfs
_require_scratch
_require_test_program "t_open_tmpfiles"
@@ -35,6 +36,7 @@ max_allowable_files=$(( $(cat /proc/sys/fs/file-max) / $nr_cpus / 2 ))
test $max_allowable_files -gt 0 && test $max_files -gt $max_allowable_files && \
max_files=$max_allowable_files
ulimit -n $max_files
+nr_cpus=1
# Open a lot of unlinked files
echo create >> $seqres.full
--
2.34.1

View File

@ -0,0 +1,68 @@
From 3e8693ee7b465a7e0994234c4eedfc566fa801d6 Mon Sep 17 00:00:00 2001
From: Anna Schumaker <Anna.Schumaker@Netapp.com>
Date: Thu, 27 Jan 2022 09:48:09 -0500
Subject: [PATCH 2/3] check: Fixes for running multiple instances in parallel
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
check | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/check b/check
index a08631213cbb..de4576bdc839 100755
--- a/check
+++ b/check
@@ -34,7 +34,7 @@ istop=false
_err_msg=""
# start the initialisation work now
-iam=check
+iam=check-$$
export MSGVERB="text:action"
export QA_CHECK_FS=${QA_CHECK_FS:=true}
@@ -360,6 +360,7 @@ if ! . ./common/rc; then
echo "check: failed to source common/rc"
exit 1
fi
+export PLATFORM=$(_full_platform_details)
if [ -n "$subdir_xfile" ]; then
for d in $SRC_GROUPS $FSTYP; do
@@ -435,6 +436,7 @@ _wrapup()
if $showme; then
if $needwrap; then
if $do_report; then
+ export PLATFORM="`_full_platform_details`"
_make_section_report
fi
needwrap=false
@@ -504,7 +506,7 @@ _wrapup()
sum_bad=`expr $sum_bad + $n_bad`
_wipe_counters
- rm -f /tmp/*.rawout /tmp/*.out /tmp/*.err /tmp/*.time
+ rm -f $tmp.rawout $tmp.out $tmp.err $tmp.time
if ! $OPTIONS_HAVE_SECTIONS; then
rm -f $tmp.*
fi
@@ -580,6 +582,7 @@ _adjust_oom_score -500
_run_seq() {
local cmd=(bash -c "test -w ${OOM_SCORE_ADJ} && echo 250 > ${OOM_SCORE_ADJ}; exec ./$seq")
+ (flock -x 9 || exit 1
if [ -n "${HAVE_SYSTEMD_SCOPES}" ]; then
local unit="$(systemd-escape "fs$seq").scope"
systemctl reset-failed "${unit}" &> /dev/null
@@ -589,7 +592,7 @@ _run_seq() {
return "${res}"
else
"${cmd[@]}"
- fi
+ fi) 9>/tmp/$(systemd-escape fs$seq).lock
}
_detect_kmemleak
--
2.34.1

File diff suppressed because it is too large Load Diff