move filesystem tests to tests/fs; regularize naming

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
koverstreet · Jul 11, 2024 · 909aa3f · 909aa3f
1 parent bd32ae7
commit 909aa3f
Show file tree

Hide file tree

Showing 133 changed files with 105 additions and 70 deletions.
diff --git a/tests/bcachefs/xfstests-nocow.ktest b/tests/bcachefs/xfstests-nocow.ktest
diff --git a/tests/blktests.ktest → tests/block/blktests.ktest b/tests/blktests.ktest → tests/block/blktests.ktest
diff --git a/tests/block/discard b/tests/block/discard
diff --git a/tests/md.ktest → tests/block/md.ktest b/tests/md.ktest → tests/block/md.ktest
diff --git a/tests/fs/bcachefs/.gitignore b/tests/fs/bcachefs/.gitignore
@@ -0,0 +1 @@
+bcachefs-tools
diff --git a/tests/bcachefs/32bit.ktest → tests/fs/bcachefs/32bit.ktest b/tests/bcachefs/32bit.ktest → tests/fs/bcachefs/32bit.ktest
@@ -2,7 +2,7 @@
 
 ktest_arch=x86
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/bcachefs-test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../bcachefs-test-libs.sh
 
 config-timeout 30
 

diff --git a/tests/bcachefs/bcachefs-test-libs.sh → tests/fs/bcachefs/bcachefs-test-libs.sh b/tests/bcachefs/bcachefs-test-libs.sh → tests/fs/bcachefs/bcachefs-test-libs.sh
@@ -4,7 +4,7 @@
 # ktest framework.
 #
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../test-libs.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../../test-libs.sh
 
 require-git http://evilpiepirate.org/git/bcachefs-tools.git
 require-make bcachefs-tools

diff --git a/tests/bcachefs/ec.ktest → tests/fs/bcachefs/ec.ktest b/tests/bcachefs/ec.ktest → tests/fs/bcachefs/ec.ktest
diff --git a/tests/fs/bcachefs/fstests-nocow.ktest b/tests/fs/bcachefs/fstests-nocow.ktest
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+export MKFS_OPTIONS="--nocow"
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/fstests.ktest
diff --git a/tests/bcachefs/xfstests.ktest → tests/fs/bcachefs/fstests.ktest b/tests/bcachefs/xfstests.ktest → tests/fs/bcachefs/fstests.ktest
@@ -7,7 +7,7 @@ require-make linuxquota
 
 require-git http://evilpiepirate.org/git/xfstests.git ../xfstests
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config BCACHEFS_POSIX_ACL
 require-kernel-config BCACHEFS_QUOTA
@@ -22,7 +22,7 @@ run_test()
 	bcachefs_antagonist
     fi
 
-    run_xfstests "$@"
+    run_fstests "$@"
 
     check_counters ${ktest_scratch_dev[0]}
     check_counters ${ktest_scratch_dev[1]}

diff --git a/tests/bcachefs/fuse.ktest → tests/fs/bcachefs/fuse.ktest b/tests/bcachefs/fuse.ktest → tests/fs/bcachefs/fuse.ktest
@@ -7,7 +7,7 @@ require-make linuxquota
 
 require-git http://evilpiepirate.org/git/xfstests.git ../xfstests
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config FUSE_FS
 
@@ -19,7 +19,7 @@ run_tests()
 {
     mv /usr/local/sbin/mount.fuse.bcachefs /sbin
 
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"

diff --git a/tests/bcachefs/gcov-ec.ktest → tests/fs/bcachefs/gcov-ec.ktest b/tests/bcachefs/gcov-ec.ktest → tests/fs/bcachefs/gcov-ec.ktest
diff --git a/tests/bcachefs/gcov-quota.ktest → tests/fs/bcachefs/gcov-fstests-nocow.ktest b/tests/bcachefs/gcov-quota.ktest → tests/fs/bcachefs/gcov-fstests-nocow.ktest
diff --git a/tests/bcachefs/gcov-replication.ktest → tests/fs/bcachefs/gcov-fstests.ktest b/tests/bcachefs/gcov-replication.ktest → tests/fs/bcachefs/gcov-fstests.ktest
diff --git a/tests/bcachefs/gcov-single_device.ktest → tests/fs/bcachefs/gcov-quota.ktest b/tests/bcachefs/gcov-single_device.ktest → tests/fs/bcachefs/gcov-quota.ktest
diff --git a/tests/bcachefs/gcov-subvol.ktest → tests/fs/bcachefs/gcov-replication.ktest b/tests/bcachefs/gcov-subvol.ktest → tests/fs/bcachefs/gcov-replication.ktest
diff --git a/tests/bcachefs/gcov-tier.ktest → tests/fs/bcachefs/gcov-single_device.ktest b/tests/bcachefs/gcov-tier.ktest → tests/fs/bcachefs/gcov-single_device.ktest
diff --git a/tests/bcachefs/gcov-units.ktest → tests/fs/bcachefs/gcov-subvol.ktest b/tests/bcachefs/gcov-units.ktest → tests/fs/bcachefs/gcov-subvol.ktest
diff --git a/tests/bcachefs/gcov-xfstests-nocow.ktest → tests/fs/bcachefs/gcov-tier.ktest b/tests/bcachefs/gcov-xfstests-nocow.ktest → tests/fs/bcachefs/gcov-tier.ktest
diff --git a/tests/bcachefs/gcov-xfstests.ktest → tests/fs/bcachefs/gcov-units.ktest b/tests/bcachefs/gcov-xfstests.ktest → tests/fs/bcachefs/gcov-units.ktest
diff --git a/tests/bcachefs/kasan-ec.ktest → tests/fs/bcachefs/kasan-ec.ktest b/tests/bcachefs/kasan-ec.ktest → tests/fs/bcachefs/kasan-ec.ktest
diff --git a/tests/bcachefs/kasan-quota.ktest → tests/fs/bcachefs/kasan-fstests-nocow.ktest b/tests/bcachefs/kasan-quota.ktest → tests/fs/bcachefs/kasan-fstests-nocow.ktest
diff --git a/tests/btrfs/kasan-fstests.ktest → tests/fs/bcachefs/kasan-fstests.ktest b/tests/btrfs/kasan-fstests.ktest → tests/fs/bcachefs/kasan-fstests.ktest
diff --git a/tests/bcachefs/kasan-replication.ktest → tests/fs/bcachefs/kasan-quota.ktest b/tests/bcachefs/kasan-replication.ktest → tests/fs/bcachefs/kasan-quota.ktest
diff --git a/tests/bcachefs/kasan-single_device.ktest → tests/fs/bcachefs/kasan-replication.ktest b/tests/bcachefs/kasan-single_device.ktest → tests/fs/bcachefs/kasan-replication.ktest
diff --git a/tests/bcachefs/kasan-subvol.ktest → tests/fs/bcachefs/kasan-single_device.ktest b/tests/bcachefs/kasan-subvol.ktest → tests/fs/bcachefs/kasan-single_device.ktest
diff --git a/tests/bcachefs/kasan-tier.ktest → tests/fs/bcachefs/kasan-subvol.ktest b/tests/bcachefs/kasan-tier.ktest → tests/fs/bcachefs/kasan-subvol.ktest
diff --git a/tests/bcachefs/kasan-units.ktest → tests/fs/bcachefs/kasan-tier.ktest b/tests/bcachefs/kasan-units.ktest → tests/fs/bcachefs/kasan-tier.ktest
diff --git a/tests/bcachefs/kasan-xfstests-nocow.ktest → tests/fs/bcachefs/kasan-units.ktest b/tests/bcachefs/kasan-xfstests-nocow.ktest → tests/fs/bcachefs/kasan-units.ktest
diff --git a/tests/bcachefs/kmsan-ec.ktest → tests/fs/bcachefs/kmsan-ec.ktest b/tests/bcachefs/kmsan-ec.ktest → tests/fs/bcachefs/kmsan-ec.ktest
diff --git a/tests/bcachefs/kmsan-quota.ktest → tests/fs/bcachefs/kmsan-fstests-nocow.ktest b/tests/bcachefs/kmsan-quota.ktest → tests/fs/bcachefs/kmsan-fstests-nocow.ktest
diff --git a/tests/bcachefs/kmsan-replication.ktest → tests/fs/bcachefs/kmsan-fstests.ktest b/tests/bcachefs/kmsan-replication.ktest → tests/fs/bcachefs/kmsan-fstests.ktest
diff --git a/tests/bcachefs/kmsan-single_device.ktest → tests/fs/bcachefs/kmsan-quota.ktest b/tests/bcachefs/kmsan-single_device.ktest → tests/fs/bcachefs/kmsan-quota.ktest
diff --git a/tests/bcachefs/kmsan-subvol.ktest → tests/fs/bcachefs/kmsan-replication.ktest b/tests/bcachefs/kmsan-subvol.ktest → tests/fs/bcachefs/kmsan-replication.ktest
diff --git a/tests/bcachefs/kmsan-tier.ktest → tests/fs/bcachefs/kmsan-single_device.ktest b/tests/bcachefs/kmsan-tier.ktest → tests/fs/bcachefs/kmsan-single_device.ktest
diff --git a/tests/bcachefs/kmsan-units.ktest → tests/fs/bcachefs/kmsan-subvol.ktest b/tests/bcachefs/kmsan-units.ktest → tests/fs/bcachefs/kmsan-subvol.ktest
diff --git a/tests/bcachefs/kmsan-xfstests-nocow.ktest → tests/fs/bcachefs/kmsan-tier.ktest b/tests/bcachefs/kmsan-xfstests-nocow.ktest → tests/fs/bcachefs/kmsan-tier.ktest
diff --git a/tests/bcachefs/kmsan-xfstests.ktest → tests/fs/bcachefs/kmsan-units.ktest b/tests/bcachefs/kmsan-xfstests.ktest → tests/fs/bcachefs/kmsan-units.ktest
diff --git a/tests/bcachefs/lockdep-ec.ktest → tests/fs/bcachefs/lockdep-ec.ktest b/tests/bcachefs/lockdep-ec.ktest → tests/fs/bcachefs/lockdep-ec.ktest
diff --git a/tests/bcachefs/lockdep-quota.ktest → ...s/fs/bcachefs/lockdep-fstests-nocow.ktest b/tests/bcachefs/lockdep-quota.ktest → ...s/fs/bcachefs/lockdep-fstests-nocow.ktest
diff --git a/tests/btrfs/lockdep-fstests.ktest → tests/fs/bcachefs/lockdep-fstests.ktest b/tests/btrfs/lockdep-fstests.ktest → tests/fs/bcachefs/lockdep-fstests.ktest
diff --git a/tests/bcachefs/lockdep-replication.ktest → tests/fs/bcachefs/lockdep-quota.ktest b/tests/bcachefs/lockdep-replication.ktest → tests/fs/bcachefs/lockdep-quota.ktest
diff --git a/tests/bcachefs/lockdep-single_device.ktest → tests/fs/bcachefs/lockdep-replication.ktest b/tests/bcachefs/lockdep-single_device.ktest → tests/fs/bcachefs/lockdep-replication.ktest
diff --git a/tests/bcachefs/lockdep-subvol.ktest → ...s/fs/bcachefs/lockdep-single_device.ktest b/tests/bcachefs/lockdep-subvol.ktest → ...s/fs/bcachefs/lockdep-single_device.ktest
diff --git a/tests/bcachefs/lockdep-tier.ktest → tests/fs/bcachefs/lockdep-subvol.ktest b/tests/bcachefs/lockdep-tier.ktest → tests/fs/bcachefs/lockdep-subvol.ktest
diff --git a/tests/bcachefs/lockdep-units.ktest → tests/fs/bcachefs/lockdep-tier.ktest b/tests/bcachefs/lockdep-units.ktest → tests/fs/bcachefs/lockdep-tier.ktest
diff --git a/tests/bcachefs/lockdep-xfstests-nocow.ktest → tests/fs/bcachefs/lockdep-units.ktest b/tests/bcachefs/lockdep-xfstests-nocow.ktest → tests/fs/bcachefs/lockdep-units.ktest
diff --git a/tests/bcachefs/module.ktest → tests/fs/bcachefs/module.ktest b/tests/bcachefs/module.ktest → tests/fs/bcachefs/module.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../test-libs.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../../test-libs.sh
 
 require-git http://evilpiepirate.org/git/bcachefs-tools.git
 require-make bcachefs-tools

diff --git a/tests/bcachefs/nas_apps.ktest → tests/fs/bcachefs/nas_apps.ktest b/tests/bcachefs/nas_apps.ktest → tests/fs/bcachefs/nas_apps.ktest
diff --git a/tests/bcachefs/nfs.ktest → tests/fs/bcachefs/nfs.ktest b/tests/bcachefs/nfs.ktest → tests/fs/bcachefs/nfs.ktest
diff --git a/tests/nodebug-base.sh → tests/fs/bcachefs/nodebug-base.sh b/tests/nodebug-base.sh → tests/fs/bcachefs/nodebug-base.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-kernel-config PREEMPT
 export NO_BCACHEFS_DEBUG=1

diff --git a/tests/bcachefs/nodebug-ec.ktest → tests/fs/bcachefs/nodebug-ec.ktest b/tests/bcachefs/nodebug-ec.ktest → tests/fs/bcachefs/nodebug-ec.ktest
diff --git a/tests/bcachefs/nodebug-quota.ktest → ...s/fs/bcachefs/nodebug-fstests-nocow.ktest b/tests/bcachefs/nodebug-quota.ktest → ...s/fs/bcachefs/nodebug-fstests-nocow.ktest
diff --git a/tests/bcachefs/nodebug-replication.ktest → tests/fs/bcachefs/nodebug-fstests.ktest b/tests/bcachefs/nodebug-replication.ktest → tests/fs/bcachefs/nodebug-fstests.ktest
diff --git a/tests/bcachefs/nodebug-single_device.ktest → tests/fs/bcachefs/nodebug-quota.ktest b/tests/bcachefs/nodebug-single_device.ktest → tests/fs/bcachefs/nodebug-quota.ktest
diff --git a/tests/bcachefs/nodebug-subvol.ktest → tests/fs/bcachefs/nodebug-replication.ktest b/tests/bcachefs/nodebug-subvol.ktest → tests/fs/bcachefs/nodebug-replication.ktest
diff --git a/tests/bcachefs/nodebug-tier.ktest → ...s/fs/bcachefs/nodebug-single_device.ktest b/tests/bcachefs/nodebug-tier.ktest → ...s/fs/bcachefs/nodebug-single_device.ktest
diff --git a/tests/bcachefs/nodebug-units.ktest → tests/fs/bcachefs/nodebug-subvol.ktest b/tests/bcachefs/nodebug-units.ktest → tests/fs/bcachefs/nodebug-subvol.ktest
diff --git a/tests/bcachefs/nodebug-xfstests-nocow.ktest → tests/fs/bcachefs/nodebug-tier.ktest b/tests/bcachefs/nodebug-xfstests-nocow.ktest → tests/fs/bcachefs/nodebug-tier.ktest
diff --git a/tests/bcachefs/nodebug-xfstests.ktest → tests/fs/bcachefs/nodebug-units.ktest b/tests/bcachefs/nodebug-xfstests.ktest → tests/fs/bcachefs/nodebug-units.ktest
diff --git a/tests/bcachefs/perf-fio.ktest → tests/fs/bcachefs/perf-fio.ktest b/tests/bcachefs/perf-fio.ktest → tests/fs/bcachefs/perf-fio.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-git http://evilpiepirate.org/git/bcachefs-tools.git
 require-make bcachefs-tools

diff --git a/tests/bcachefs/perf.ktest → tests/fs/bcachefs/perf.ktest b/tests/bcachefs/perf.ktest → tests/fs/bcachefs/perf.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-git http://evilpiepirate.org/git/bcachefs-tools.git
 require-make bcachefs-tools

diff --git a/tests/bcachefs/preempt-ec.ktest → tests/fs/bcachefs/preempt-ec.ktest b/tests/bcachefs/preempt-ec.ktest → tests/fs/bcachefs/preempt-ec.ktest
diff --git a/tests/bcachefs/preempt-quota.ktest → ...s/fs/bcachefs/preempt-fstests-nocow.ktest b/tests/bcachefs/preempt-quota.ktest → ...s/fs/bcachefs/preempt-fstests-nocow.ktest
diff --git a/tests/bcachefs/preempt-replication.ktest → tests/fs/bcachefs/preempt-fstests.ktest b/tests/bcachefs/preempt-replication.ktest → tests/fs/bcachefs/preempt-fstests.ktest
diff --git a/tests/bcachefs/preempt-single_device.ktest → tests/fs/bcachefs/preempt-quota.ktest b/tests/bcachefs/preempt-single_device.ktest → tests/fs/bcachefs/preempt-quota.ktest
diff --git a/tests/bcachefs/preempt-subvol.ktest → tests/fs/bcachefs/preempt-replication.ktest b/tests/bcachefs/preempt-subvol.ktest → tests/fs/bcachefs/preempt-replication.ktest
diff --git a/tests/bcachefs/preempt-tier.ktest → ...s/fs/bcachefs/preempt-single_device.ktest b/tests/bcachefs/preempt-tier.ktest → ...s/fs/bcachefs/preempt-single_device.ktest
diff --git a/tests/bcachefs/preempt-units.ktest → tests/fs/bcachefs/preempt-subvol.ktest b/tests/bcachefs/preempt-units.ktest → tests/fs/bcachefs/preempt-subvol.ktest
diff --git a/tests/bcachefs/preempt-xfstests-nocow.ktest → tests/fs/bcachefs/preempt-tier.ktest b/tests/bcachefs/preempt-xfstests-nocow.ktest → tests/fs/bcachefs/preempt-tier.ktest
diff --git a/tests/bcachefs/preempt-xfstests.ktest → tests/fs/bcachefs/preempt-units.ktest b/tests/bcachefs/preempt-xfstests.ktest → tests/fs/bcachefs/preempt-units.ktest
diff --git a/tests/bcachefs/quota.ktest → tests/fs/bcachefs/quota.ktest b/tests/bcachefs/quota.ktest → tests/fs/bcachefs/quota.ktest
diff --git a/tests/bcachefs/replication.ktest → tests/fs/bcachefs/replication.ktest b/tests/bcachefs/replication.ktest → tests/fs/bcachefs/replication.ktest
diff --git a/tests/bcachefs/single_device.ktest → tests/fs/bcachefs/single_device.ktest b/tests/bcachefs/single_device.ktest → tests/fs/bcachefs/single_device.ktest
diff --git a/tests/bcachefs/subvol.ktest → tests/fs/bcachefs/subvol.ktest b/tests/bcachefs/subvol.ktest → tests/fs/bcachefs/subvol.ktest
diff --git a/tests/bcachefs/tier.ktest → tests/fs/bcachefs/tier.ktest b/tests/bcachefs/tier.ktest → tests/fs/bcachefs/tier.ktest
diff --git a/tests/bcachefs/ubsan-ec.ktest → tests/fs/bcachefs/ubsan-ec.ktest b/tests/bcachefs/ubsan-ec.ktest → tests/fs/bcachefs/ubsan-ec.ktest
diff --git a/tests/bcachefs/ubsan-quota.ktest → tests/fs/bcachefs/ubsan-fstests-nocow.ktest b/tests/bcachefs/ubsan-quota.ktest → tests/fs/bcachefs/ubsan-fstests-nocow.ktest
diff --git a/tests/btrfs/ubsan-fstests.ktest → tests/fs/bcachefs/ubsan-fstests.ktest b/tests/btrfs/ubsan-fstests.ktest → tests/fs/bcachefs/ubsan-fstests.ktest
diff --git a/tests/bcachefs/ubsan-replication.ktest → tests/fs/bcachefs/ubsan-quota.ktest b/tests/bcachefs/ubsan-replication.ktest → tests/fs/bcachefs/ubsan-quota.ktest
diff --git a/tests/bcachefs/ubsan-single_device.ktest → tests/fs/bcachefs/ubsan-replication.ktest b/tests/bcachefs/ubsan-single_device.ktest → tests/fs/bcachefs/ubsan-replication.ktest
diff --git a/tests/bcachefs/ubsan-subvol.ktest → tests/fs/bcachefs/ubsan-single_device.ktest b/tests/bcachefs/ubsan-subvol.ktest → tests/fs/bcachefs/ubsan-single_device.ktest
diff --git a/tests/bcachefs/ubsan-tier.ktest → tests/fs/bcachefs/ubsan-subvol.ktest b/tests/bcachefs/ubsan-tier.ktest → tests/fs/bcachefs/ubsan-subvol.ktest
diff --git a/tests/bcachefs/ubsan-units.ktest → tests/fs/bcachefs/ubsan-tier.ktest b/tests/bcachefs/ubsan-units.ktest → tests/fs/bcachefs/ubsan-tier.ktest
diff --git a/tests/bcachefs/ubsan-xfstests-nocow.ktest → tests/fs/bcachefs/ubsan-units.ktest b/tests/bcachefs/ubsan-xfstests-nocow.ktest → tests/fs/bcachefs/ubsan-units.ktest
diff --git a/tests/bcachefs/units.ktest → tests/fs/bcachefs/units.ktest b/tests/bcachefs/units.ktest → tests/fs/bcachefs/units.ktest
diff --git a/tests/btrfs/fstests-quota.ktest → tests/fs/btrfs/fstests-quota.ktest b/tests/btrfs/fstests-quota.ktest → tests/fs/btrfs/fstests-quota.ktest
diff --git a/tests/btrfs/fstests-rt.ktest → tests/fs/btrfs/fstests-rt.ktest b/tests/btrfs/fstests-rt.ktest → tests/fs/btrfs/fstests-rt.ktest
diff --git a/tests/btrfs/fstests.ktest → tests/fs/btrfs/fstests.ktest b/tests/btrfs/fstests.ktest → tests/fs/btrfs/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config BTRFS_FS
 require-kernel-config BTRFS_FS_POSIX_ACL
@@ -15,7 +15,7 @@ export MKFS_OPTIONS=
 
 run_tests()
 {
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/btrfs/gcov-fstests.ktest → tests/fs/btrfs/gcov-fstests.ktest b/tests/btrfs/gcov-fstests.ktest → tests/fs/btrfs/gcov-fstests.ktest
diff --git a/tests/ext4/kasan-fstests.ktest → tests/fs/btrfs/kasan-fstests.ktest b/tests/ext4/kasan-fstests.ktest → tests/fs/btrfs/kasan-fstests.ktest
diff --git a/tests/ext4/lockdep-fstests.ktest → tests/fs/btrfs/lockdep-fstests.ktest b/tests/ext4/lockdep-fstests.ktest → tests/fs/btrfs/lockdep-fstests.ktest
diff --git a/tests/ext4/ubsan-fstests.ktest → tests/fs/btrfs/ubsan-fstests.ktest b/tests/ext4/ubsan-fstests.ktest → tests/fs/btrfs/ubsan-fstests.ktest
diff --git a/tests/ext2.ktest → tests/fs/ext2/fstests.ktest b/tests/ext2.ktest → tests/fs/ext2/fstests.ktest
@@ -1,18 +1,17 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config EXT2_FS
 require-kernel-config EXT2_FS_XATTR
 require-kernel-config EXT2_FS_POSIX_ACL
 
 export FSTYP=ext2
+export MKFS_OPTIONS=
 
 run_tests()
 {
-    export MKFS_OPTIONS=
-
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/nilfs2/gcov-fstests.ktest → tests/fs/ext2/gcov-fstests.ktest b/tests/nilfs2/gcov-fstests.ktest → tests/fs/ext2/gcov-fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-gcov fs/xfs
 

diff --git a/tests/f2fs/kasan-fstests.ktest → tests/fs/ext2/kasan-fstests.ktest b/tests/f2fs/kasan-fstests.ktest → tests/fs/ext2/kasan-fstests.ktest
diff --git a/tests/f2fs/lockdep-fstests.ktest → tests/fs/ext2/lockdep-fstests.ktest b/tests/f2fs/lockdep-fstests.ktest → tests/fs/ext2/lockdep-fstests.ktest
diff --git a/tests/f2fs/ubsan-fstests.ktest → tests/fs/ext2/ubsan-fstests.ktest b/tests/f2fs/ubsan-fstests.ktest → tests/fs/ext2/ubsan-fstests.ktest
diff --git a/tests/ext4/fstests.ktest → tests/fs/ext4/fstests.ktest b/tests/ext4/fstests.ktest → tests/fs/ext4/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config EXT4_FS
 require-kernel-config EXT4_FS_POSIX_ACL
@@ -12,7 +12,7 @@ export MKFS_OPTIONS=
 
 run_tests()
 {
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/jfs/gcov-fstests.ktest → tests/fs/ext4/gcov-fstests.ktest b/tests/jfs/gcov-fstests.ktest → tests/fs/ext4/gcov-fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-gcov fs/xfs
 

diff --git a/tests/jfs/kasan-fstests.ktest → tests/fs/ext4/kasan-fstests.ktest b/tests/jfs/kasan-fstests.ktest → tests/fs/ext4/kasan-fstests.ktest
diff --git a/tests/jfs/lockdep-fstests.ktest → tests/fs/ext4/lockdep-fstests.ktest b/tests/jfs/lockdep-fstests.ktest → tests/fs/ext4/lockdep-fstests.ktest
diff --git a/tests/jfs/ubsan-fstests.ktest → tests/fs/ext4/ubsan-fstests.ktest b/tests/jfs/ubsan-fstests.ktest → tests/fs/ext4/ubsan-fstests.ktest
diff --git a/tests/f2fs/fstests.ktest → tests/fs/f2fs/fstests.ktest b/tests/f2fs/fstests.ktest → tests/fs/f2fs/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config F2FS_FS
 require-kernel-config F2FS_STAT_FS
@@ -14,7 +14,7 @@ export MKFS_OPTIONS=
 
 run_tests()
 {
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/f2fs/gcov-fstests.ktest → tests/fs/f2fs/gcov-fstests.ktest b/tests/f2fs/gcov-fstests.ktest → tests/fs/f2fs/gcov-fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-gcov fs/xfs
 

diff --git a/tests/nilfs2/kasan-fstests.ktest → tests/fs/f2fs/kasan-fstests.ktest b/tests/nilfs2/kasan-fstests.ktest → tests/fs/f2fs/kasan-fstests.ktest
diff --git a/tests/nilfs2/lockdep-fstests.ktest → tests/fs/f2fs/lockdep-fstests.ktest b/tests/nilfs2/lockdep-fstests.ktest → tests/fs/f2fs/lockdep-fstests.ktest
diff --git a/tests/nilfs2/ubsan-fstests.ktest → tests/fs/f2fs/ubsan-fstests.ktest b/tests/nilfs2/ubsan-fstests.ktest → tests/fs/f2fs/ubsan-fstests.ktest
diff --git a/tests/xfstests.sh → tests/fs/fstests.sh b/tests/xfstests.sh → tests/fs/fstests.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # xfstests wrapper:
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/test-libs.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../test-libs.sh
 
 require-git https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git xfstests
 
@@ -50,7 +50,7 @@ list_tests()
     popd > /dev/null
 }
 
-run_xfstests()
+run_fstests()
 {
     if [[ ! -f /xfstests-init-done ]]; then
 	mkswap ${ktest_scratch_dev[3]}

diff --git a/tests/jfs/fstests.ktest → tests/fs/jfs/fstests.ktest b/tests/jfs/fstests.ktest → tests/fs/jfs/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config JFS_FS
 require-kernel-config JFS_POSIX_ACL
@@ -12,7 +12,7 @@ export MKFS_OPTIONS=
 
 run_tests()
 {
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/ext4/gcov-fstests.ktest → tests/fs/jfs/gcov-fstests.ktest b/tests/ext4/gcov-fstests.ktest → tests/fs/jfs/gcov-fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-gcov fs/xfs
 

diff --git a/tests/xfs/kasan-fstests.ktest → tests/fs/jfs/kasan-fstests.ktest b/tests/xfs/kasan-fstests.ktest → tests/fs/jfs/kasan-fstests.ktest
diff --git a/tests/xfs/lockdep-fstests.ktest → tests/fs/jfs/lockdep-fstests.ktest b/tests/xfs/lockdep-fstests.ktest → tests/fs/jfs/lockdep-fstests.ktest
diff --git a/tests/xfs/ubsan-fstests.ktest → tests/fs/jfs/ubsan-fstests.ktest b/tests/xfs/ubsan-fstests.ktest → tests/fs/jfs/ubsan-fstests.ktest
diff --git a/tests/nfs/xfstests.ktest → tests/fs/nfs/fstests.ktest b/tests/nfs/xfstests.ktest → tests/fs/nfs/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-git http://evilpiepirate.org/git/xfstests.git ../xfstests
 
@@ -73,7 +73,7 @@ EOF
 	touch /xfstests-config-done
     fi
 
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/nfs/kasan-xfstests.ktest → tests/fs/nfs/kasan-fstests.ktest b/tests/nfs/kasan-xfstests.ktest → tests/fs/nfs/kasan-fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 config-timeout-multiplier 3
 

diff --git a/tests/nfs/lockdep-xfstests.ktest → tests/fs/nfs/lockdep-fstests.ktest b/tests/nfs/lockdep-xfstests.ktest → tests/fs/nfs/lockdep-fstests.ktest
diff --git a/tests/nilfs2/fstests.ktest → tests/fs/nilfs2/fstests.ktest b/tests/nilfs2/fstests.ktest → tests/fs/nilfs2/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config NILFS2_FS
 
@@ -9,7 +9,7 @@ export MKFS_OPTIONS=
 
 run_tests()
 {
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/fs/nilfs2/gcov-fstests.ktest b/tests/fs/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/bcachefs/kasan-xfstests.ktest → tests/fs/nilfs2/kasan-fstests.ktest b/tests/bcachefs/kasan-xfstests.ktest → tests/fs/nilfs2/kasan-fstests.ktest
diff --git a/tests/bcachefs/lockdep-xfstests.ktest → tests/fs/nilfs2/lockdep-fstests.ktest b/tests/bcachefs/lockdep-xfstests.ktest → tests/fs/nilfs2/lockdep-fstests.ktest
diff --git a/tests/bcachefs/ubsan-xfstests.ktest → tests/fs/nilfs2/ubsan-fstests.ktest b/tests/bcachefs/ubsan-xfstests.ktest → tests/fs/nilfs2/ubsan-fstests.ktest
diff --git a/tests/puzzlefs/puzzlefs.ktest → tests/fs/puzzlefs/puzzlefs.ktest b/tests/puzzlefs/puzzlefs.ktest → tests/fs/puzzlefs/puzzlefs.ktest
@@ -3,7 +3,7 @@
 # PuzzleFS tests
 #
 
-. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../test-libs.sh
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../../test-libs.sh
 
 require-git https://github.com/project-machine/puzzlefs
 require-make puzzlefs

diff --git a/tests/fs/squashfs.ktest b/tests/fs/squashfs.ktest
@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../test-libs.sh
+
+require-kernel-config MISC_FILESYSTEMS
+require-kernel-config SQUASHFS
+require-kernel-config SQUASHFS_ZLIB
+require-kernel-config SQUASHFS_LZO
+require-kernel-config SQUASHFS_LZ4
+require-kernel-config SQUASHFS_XZ
+require-kernel-config SQUASHFS_ZSTD
+
+config-timeout $(stress_timeout)
+
+config-image /home/kent/squashfs-test-images/file.sqsh
+config-image /home/kent/squashfs-test-images/bcachefs-tools.gzip.sqfs
+config-image /home/kent/squashfs-test-images/bcachefs-tools.lz4.sqfs
+config-image /home/kent/squashfs-test-images/bcachefs-tools.lzo.sqfs
+config-image /home/kent/squashfs-test-images/bcachefs-tools.xz.sqfs
+config-image /home/kent/squashfs-test-images/bcachefs-tools.zstd.sqfs
+
+case $1 in
+    prep)
+	for c in gzip lzo lz4 xz zstd lzma; do
+	    mksquashfs . bcachefs-tools.$c.sqfs -comp $c
+	done
+	;;
+esac
+
+test_squashfs()
+{
+    for dev in /dev/vdb; do
+	echo "testing image $dev"
+
+	mount -t squashfs $dev /mnt
+	find /mnt -type f -print|xargs cat > /dev/null
+	umount /mnt
+    done
+}
+
+main "$@"
diff --git a/tests/xfs/fstests-1k.ktest → tests/fs/xfs/fstests-1k.ktest b/tests/xfs/fstests-1k.ktest → tests/fs/xfs/fstests-1k.ktest
diff --git a/tests/xfs/fstests-quota.ktest → tests/fs/xfs/fstests-quota.ktest b/tests/xfs/fstests-quota.ktest → tests/fs/xfs/fstests-quota.ktest
diff --git a/tests/xfs/fstests-rt.ktest → tests/fs/xfs/fstests-rt.ktest b/tests/xfs/fstests-rt.ktest → tests/fs/xfs/fstests-rt.ktest
diff --git a/tests/xfs/fstests.ktest → tests/fs/xfs/fstests.ktest b/tests/xfs/fstests.ktest → tests/fs/xfs/fstests.ktest
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../xfstests.sh
+. $(dirname $(readlink -e "${BASH_SOURCE[0]}"))/../fstests.sh
 
 require-kernel-config XFS_FS
 require-kernel-config XFS_QUOTA
@@ -17,7 +17,7 @@ export FSTYP=xfs
 
 run_tests()
 {
-    run_xfstests "$@"
+    run_fstests "$@"
 }
 
 main "$@"
diff --git a/tests/fs/xfs/gcov-fstests.ktest b/tests/fs/xfs/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/fs/xfs/kasan-fstests.ktest b/tests/fs/xfs/kasan-fstests.ktest
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../kasan-base.sh
diff --git a/tests/fs/xfs/lockdep-fstests.ktest b/tests/fs/xfs/lockdep-fstests.ktest
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+. $(dirname $(readlink -e ${BASH_SOURCE[0]}))/../lockdep-base.sh