From c7551e9a947114732f679ac7571b73d8d037347c Mon Sep 17 00:00:00 2001
From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Tue, 9 Jul 2024 12:38:18 -0400
Subject: [PATCH] add variants for nilfs2

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---
 tests/jfs.ktest                    | 17 -----------------
 tests/nilfs2.ktest                 | 14 --------------
 tests/nilfs2/fstests-quota.ktest   |  6 ++++++
 tests/nilfs2/fstests-rt.ktest      |  7 +++++++
 tests/nilfs2/fstests.ktest         | 15 +++++++++++++++
 tests/nilfs2/gcov-fstests.ktest    |  7 +++++++
 tests/nilfs2/kasan-fstests.ktest   |  3 +++
 tests/nilfs2/lockdep-fstests.ktest |  3 +++
 tests/nilfs2/ubsan-fstests.ktest   |  3 +++
 9 files changed, 44 insertions(+), 31 deletions(-)
 delete mode 100755 tests/jfs.ktest
 delete mode 100755 tests/nilfs2.ktest
 create mode 100755 tests/nilfs2/fstests-quota.ktest
 create mode 100755 tests/nilfs2/fstests-rt.ktest
 create mode 100755 tests/nilfs2/fstests.ktest
 create mode 100755 tests/nilfs2/gcov-fstests.ktest
 create mode 100755 tests/nilfs2/kasan-fstests.ktest
 create mode 100755 tests/nilfs2/lockdep-fstests.ktest
 create mode 100755 tests/nilfs2/ubsan-fstests.ktest

diff --git a/tests/jfs.ktest b/tests/jfs.ktest
deleted file mode 100755
index d0c705d1..00000000
--- a/tests/jfs.ktest
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/xfstests.sh
-
-require-kernel-config JFS_FS
-require-kernel-config JFS_POSIX_ACL
-require-kernel-config JFS_DEBUG
-require-kernel-config QUOTA
-
-run_tests()
-{
-    export MKFS_OPTIONS=
-
-    run_xfstests jfs "$@"
-}
-
-main "$@"
diff --git a/tests/nilfs2.ktest b/tests/nilfs2.ktest
deleted file mode 100755
index a4645b20..00000000
--- a/tests/nilfs2.ktest
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/xfstests.sh
-
-require-kernel-config NILFS2_FS
-
-run_tests()
-{
-    export MKFS_OPTIONS=
-
-    run_xfstests nilfs2 "$@"
-}
-
-main "$@"
diff --git a/tests/nilfs2/fstests-quota.ktest b/tests/nilfs2/fstests-quota.ktest
new file mode 100755
index 00000000..e2c1a9d5
--- /dev/null
+++ b/tests/nilfs2/fstests-quota.ktest
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+export MKFS_OPTIONS="-m reflink=1,rmapbt=1 -i sparse=1,nrext64=1"
+export MOUNT_OPTIONS=" -o usrquota,grpquota,prjquota"
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/fstests.ktest
diff --git a/tests/nilfs2/fstests-rt.ktest b/tests/nilfs2/fstests-rt.ktest
new file mode 100755
index 00000000..227545b5
--- /dev/null
+++ b/tests/nilfs2/fstests-rt.ktest
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+export MKFS_OPTIONS="-d rtinherit=1, -m reflink=1,rmapbt=1 -i sparse=1,nrext64=1"
+export TEST_RTDEV=/dev/sde
+export SCRATCH_RTDEV=/dev/sdf
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/fstests.ktest
diff --git a/tests/nilfs2/fstests.ktest b/tests/nilfs2/fstests.ktest
new file mode 100755
index 00000000..cf3fb4d9
--- /dev/null
+++ b/tests/nilfs2/fstests.ktest
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+
+require-kernel-config NILFS2_FS
+
+export FSTYP=nilfs2
+export MKFS_OPTIONS=
+
+run_tests()
+{
+    run_xfstests "$@"
+}
+
+main "$@"
diff --git a/tests/nilfs2/gcov-fstests.ktest b/tests/nilfs2/gcov-fstests.ktest
new file mode 100755
index 00000000..f31c1086
--- /dev/null
+++ b/tests/nilfs2/gcov-fstests.ktest
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+
+require-gcov fs/xfs
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/fstests.ktest
diff --git a/tests/nilfs2/kasan-fstests.ktest b/tests/nilfs2/kasan-fstests.ktest
new file mode 100755
index 00000000..93bf1097
--- /dev/null
+++ b/tests/nilfs2/kasan-fstests.ktest
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../kasan-base.sh
diff --git a/tests/nilfs2/lockdep-fstests.ktest b/tests/nilfs2/lockdep-fstests.ktest
new file mode 100755
index 00000000..2ad19d00
--- /dev/null
+++ b/tests/nilfs2/lockdep-fstests.ktest
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../lockdep-base.sh
diff --git a/tests/nilfs2/ubsan-fstests.ktest b/tests/nilfs2/ubsan-fstests.ktest
new file mode 100755
index 00000000..7ff75ef5
--- /dev/null
+++ b/tests/nilfs2/ubsan-fstests.ktest
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../ubsan-base.sh