cut_fstests: add mktemp, dbench and xfs deps

Without mktemp, xfstests removes all files in the run-path - fix
submitted upstream.

The client.txt dbench loadfile is needed in addition to the binary for
xfstests generic/241.

xfs_X binaries were added to the fstests_local VM image for XFS specific
xfstests runs.

Signed-off-by: David Disseldorp <ddiss@suse.de>

diff --git a/cut_cifs.sh b/cut_cifs.sh
index 170631da3f8089c5909f91abbd65660a4f3e84f6..4373029a67f8b4621142bd319ffe2251d4dba729 100755 (executable)
--- a/cut_cifs.sh
+++ b/cut_cifs.sh
@@ -20,11 +20,12 @@ dracut --no-compress  --kver "$KVER" \
        --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
                   strace mkfs mkfs.xfs /lib64/libkeyutils.so.1 \
                   which perl awk bc touch cut chmod true false \
-                  xfs_io getfattr setfattr chacl attr killall \
+                  mktemp getfattr setfattr chacl attr killall \
                   id sort uniq date expr tac diff head dirname seq \
                   /usr/lib64/libhandle.so.1 /lib64/libssl.so.1.0.0 \
-                  basename tee egrep hexdump sync xfs_db mount.cifs \
-                  fstrim fio logger dbench dmsetup chattr cmp stat" \
+                  basename tee egrep hexdump sync xfs_db xfs_io mount.cifs \
+                  fstrim fio logger dmsetup chattr cmp stat \
+                  dbench /usr/share/dbench/client.txt" \
        --include "$FSTESTS_DIR" "/fstests" \
        --include "$RAPIDO_DIR/cifs_autorun.sh" "/.profile" \
        --include "$RAPIDO_DIR/rapido.conf" "/rapido.conf" \

diff --git a/cut_fstests_cephfs.sh b/cut_fstests_cephfs.sh
index 99403738f27aed889d0eaefcab02b8d3cd5a93a4..34f644ffc7d1f5c0f641b125871bd54aeb357516 100755 (executable)
--- a/cut_fstests_cephfs.sh
+++ b/cut_fstests_cephfs.sh
@@ -20,11 +20,12 @@ dracut --no-compress  --kver "$KVER" \
        --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
                   strace mkfs mkfs.xfs /lib64/libkeyutils.so.1 \
                   which perl awk bc touch cut chmod true false \
-                  xfs_io getfattr setfattr chacl attr killall \
+                  mktemp getfattr setfattr chacl attr killall \
                   id sort uniq date expr tac diff head dirname seq \
                   /usr/lib64/libhandle.so.1 /lib64/libssl.so.1.0.0 \
-                  basename tee egrep hexdump sync xfs_db \
-                  fstrim fio logger dbench dmsetup chattr cmp stat" \
+                  basename tee egrep hexdump sync xfs_db xfs_io \
+                  fstrim fio logger dmsetup chattr cmp stat \
+                  dbench /usr/share/dbench/client.txt" \
        --include "$FSTESTS_DIR" "/fstests" \
        --include "$CEPH_MOUNT_BIN" "/sbin/mount.ceph" \
        --include "$CEPH_CONF" "/etc/ceph/ceph.conf" \

diff --git a/cut_fstests_local.sh b/cut_fstests_local.sh
index 6e7e8d7b7f141fe82a0ff741de55de33b52a9c15..a1fe06fb46bd4ad91a3edcefbc5246871c928035 100755 (executable)
--- a/cut_fstests_local.sh
+++ b/cut_fstests_local.sh
@@ -20,11 +20,13 @@ dracut --no-compress  --kver "$KVER" \
        --install "tail blockdev ps rmdir resize dd vim grep find df sha256sum \
                   strace mkfs mkfs.btrfs mkfs.xfs /lib64/libkeyutils.so.1 \
                   which perl awk bc touch cut chmod true false \
-                  xfs_io getfattr setfattr chacl attr killall \
+                  mktemp getfattr setfattr chacl attr killall \
                   id sort uniq date expr tac diff head dirname seq \
                   /usr/lib64/libhandle.so.1 /lib64/libssl.so.1.0.0 \
-                  basename tee egrep hexdump sync xfs_db \
-                  fstrim fio logger dbench dmsetup chattr cmp stat" \
+                  basename tee egrep hexdump sync xfs_db xfs_io \
+                  xfs_logprint xfs_repair xfs_growfs \
+                  fstrim fio logger dmsetup chattr cmp stat \
+                  dbench /usr/share/dbench/client.txt" \
        --include "$FSTESTS_DIR" "/fstests" \
        --include "$RAPIDO_DIR/fstest_local_autorun.sh" "/.profile" \
        --include "$RAPIDO_DIR/rapido.conf" "/rapido.conf" \