Add fstests wrappers for more filesystems

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>

9 files changed, 74 insertions, 8 deletions

diff --git a/root_image b/root_image
index 0ef3b7a..09dc97f 100755
--- a/root_image
+++ b/root_image
@@ -71,12 +71,13 @@ parse_arch "$ktest_arch"
 
 mkdir -p "$(dirname "$ktest_image")"
 
-PACKAGES=(kexec-tools less psmisc openssh-server	\
-    build-essential make gcc g++			\
-    autoconf automake autopoint bison			\
-    pkg-config libtool-bin				\
+PACKAGES=(kexec-tools less psmisc openssh-server		\
+    build-essential make gcc g++				\
+    autoconf automake autopoint bison				\
+    pkg-config libtool-bin					\
     gdb strace ltrace linux-perf trace-cmd blktrace sysstat	\
-    hdparm btrfs-progs mdadm lvm2			\
+    hdparm mdadm lvm2						\
+    btrfs-progs jfsutils nilfs-tools f2fs-tools			\
     bc attr gawk acl rsync git python3-docutils)
 
 # stress testing:
diff --git a/tests/btrfs.ktest b/tests/btrfs.ktest
index d628bcb..4bbd0fd 100644
--- a/tests/btrfs.ktest
+++ b/tests/btrfs.ktest
@@ -3,12 +3,18 @@
 require-lib test-libs.sh
 
 require-kernel-config BTRFS_FS
-require-kernel-config QUOTA
+require-kernel-config BTRFS_FS_POSIX_ACL
+require-kernel-config BTRFS_FS_CHECK_INTEGRITY
+require-kernel-config BTRFS_FS_RUN_SANITY_TESTS
+require-kernel-config BTRFS_DEBUG
+require-kernel-config BTRFS_ASSERT
+require-kernel-config BTRFS_FS_REF_VERIFY
 
 require-lib xfstests.sh
 
 run_tests()
 {
+    export MKFS_OPTIONS=
+
     run_xfstests btrfs "$@"
 }
-
diff --git a/tests/ext2.ktest b/tests/ext2.ktest
index 2358b46..124fff8 100644
--- a/tests/ext2.ktest
+++ b/tests/ext2.ktest
@@ -8,5 +8,7 @@ require-lib xfstests.sh
 
 run_tests()
 {
+    export MKFS_OPTIONS=
+
     run_xfstests ext2 "$@"
 }
diff --git a/tests/ext3.ktest b/tests/ext3.ktest
new file mode 100644
index 0000000..e00962e
--- /dev/null
+++ b/tests/ext3.ktest
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+require-kernel-config EXT3_FS
+require-kernel-config EXT4_FS_POSIX_ACL
+
+require-lib xfstests.sh
+
+run_tests()
+{
+    export MKFS_OPTIONS=
+
+    run_xfstests ext3 "$@"
+}
diff --git a/tests/ext4.ktest b/tests/ext4.ktest
index 1faecf7..25096d0 100644
--- a/tests/ext4.ktest
+++ b/tests/ext4.ktest
@@ -9,5 +9,7 @@ require-lib xfstests.sh
 
 run_tests()
 {
+    export MKFS_OPTIONS=
+
     run_xfstests ext4 "$@"
 }
diff --git a/tests/f2fs.ktest b/tests/f2fs.ktest
new file mode 100644
index 0000000..d841491
--- /dev/null
+++ b/tests/f2fs.ktest
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+require-kernel-config F2FS_FS
+require-kernel-config F2FS_STAT_FS
+require-kernel-config F2FS_FS_XATTR
+require-kernel-config F2FS_FS_POSIX_ACL
+require-kernel-config F2FS_CHECK_FS
+require-kernel-config F2FS_FAULT_INJECTION
+
+require-lib xfstests.sh
+
+run_tests()
+{
+    export MKFS_OPTIONS=
+
+    run_xfstests f2fs "$@"
+}
diff --git a/tests/jfs.ktest b/tests/jfs.ktest
new file mode 100644
index 0000000..2f11bb2
--- /dev/null
+++ b/tests/jfs.ktest
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+require-kernel-config JFS_FS
+require-kernel-config JFS_POSIX_ACL
+require-kernel-config JFS_DEBUG
+
+require-lib xfstests.sh
+
+run_tests()
+{
+    export MKFS_OPTIONS=
+
+    run_xfstests jfs "$@"
+}
diff --git a/tests/nilfs2.ktest b/tests/nilfs2.ktest
new file mode 100644
index 0000000..c203f6d
--- /dev/null
+++ b/tests/nilfs2.ktest
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+require-kernel-config NILFS2_FS
+
+require-lib xfstests.sh
+
+run_tests()
+{
+    export MKFS_OPTIONS=
+
+    run_xfstests nilfs2 "$@"
+}
diff --git a/tests/xfs.ktest b/tests/xfs.ktest
index 866210f..4c06036 100755
--- a/tests/xfs.ktest
+++ b/tests/xfs.ktest
@@ -14,4 +14,3 @@ run_tests()
     export MKFS_OPTIONS="-m reflink=1,rmapbt=1 -i sparse=1 -b size=1024"
     run_xfstests xfs "$@"
 }
-