overlay: run unionmount testsuite test cases

[xfstests-dev.git] / common / config

diff --git a/common/config b/common/config
index a0d58bde73c544b67026c9a70c79c8540fac6326..e356bcda7e7057dfea21da5d8c93021e55d4fcab 100644 (file)
--- a/common/config
+++ b/common/config
@@ -22,6 +22,9 @@
 # RMT_IRIXTAPE_DEV- the IRIX remote tape device for the xfsdump tests
 # RMT_TAPE_USER -   remote user for tape device
 # SELINUX_MOUNT_OPTIONS - Options to use when SELinux is enabled.
+# KEEP_DMESG -      whether to keep all dmesg for each test case.
+#                   yes: keep all dmesg
+#                   no: only keep dmesg with error/warning (default)
 #
 # - These can be added to $HOST_CONFIG_DIR (witch default to ./config)
 #   below or a separate local configuration file can be used (using
@@ -68,6 +71,8 @@ export OVL_LOWER="ovl-lower"
 export OVL_WORK="ovl-work"
 # overlay mount point parent must be the base fs root
 export OVL_MNT="ovl-mnt"
+# By default unionmount-testsuite is expected under src
+export UNIONMOUNT_TESTSUITE=${UNIONMOUNT_TESTSUITE:=$here/src/unionmount-testsuite}
 
 # From e2fsprogs/e2fsck/e2fsck.h:
 # Exit code used by fsck-type programs
@@ -151,6 +156,7 @@ MKSWAP_PROG="$MKSWAP_PROG -f"
 export XFS_LOGPRINT_PROG="$(type -P xfs_logprint)"
 export XFS_REPAIR_PROG="$(type -P xfs_repair)"
 export XFS_DB_PROG="$(type -P xfs_db)"
+export XFS_ADMIN_PROG="$(type -P xfs_admin)"
 export XFS_GROWFS_PROG=$(type -P xfs_growfs)
 export XFS_SPACEMAN_PROG="$(type -P xfs_spaceman)"
 export XFS_SCRUB_PROG="$(type -P xfs_scrub)"
@@ -176,6 +182,7 @@ export XFS_COPY_PROG="$(type -P xfs_copy)"
 export FSTRIM_PROG="$(type -P fstrim)"
 export DUMPE2FS_PROG="$(type -P dumpe2fs)"
 export RESIZE2FS_PROG="$(type -P resize2fs)"
+export F2FS_IO_PROG="$(type -P f2fs_io)"
 export FIO_PROG="$(type -P fio)"
 export FILEFRAG_PROG="$(type -P filefrag)"
 export E4DEFRAG_PROG="$(type -P e4defrag)"
@@ -215,6 +222,7 @@ export DUPEREMOVE_PROG="$(type -P duperemove)"
 export CC_PROG="$(type -P cc)"
 export FSVERITY_PROG="$(type -P fsverity)"
 export OPENSSL_PROG="$(type -P openssl)"
+export ACCTON_PROG="$(type -P accton)"
 
 # use 'udevadm settle' or 'udevsettle' to wait for lv to be settled.
 # newer systems have udevadm command but older systems like RHEL5 don't.
@@ -242,6 +250,7 @@ case "$HOSTOS" in
        export MKFS_BTRFS_PROG=$(set_mkfs_prog_path_with_opts btrfs)
        export MKFS_F2FS_PROG=$(set_mkfs_prog_path_with_opts f2fs)
        export DUMP_F2FS_PROG=$(type -P dump.f2fs)
+       export F2FS_IO_PROG=$(type -P f2fs_io)
        export BTRFS_UTIL_PROG=$(type -P btrfs)
        export BTRFS_SHOW_SUPER_PROG=$(type -P btrfs-show-super)
        export BTRFS_CONVERT_PROG=$(type -P btrfs-convert)
@@ -480,8 +489,8 @@ _check_device()
        fi
 
        case "$FSTYP" in
-       9p|tmpfs)
-               # 9p mount tags are just plain strings, so anything is allowed
+       9p|tmpfs|virtiofs)
+               # 9p and virtiofs mount tags are just plain strings, so anything is allowed
                # tmpfs doesn't use mount source, ignore
                ;;
        overlay)