8:57 a.m.
This requires that nbdkit is built with the --run feature, which
(currently) is not true for Windows. (In some tests we separately
checked for !Windows, but let's favour consistency.)
---
plugins/rust/test-ramdisk.sh | 2 ++
tests/test-S3.sh | 1 +
tests/test-blkio.sh | 1 +
tests/test-block-size-constraints.sh | 1 +
tests/test-blocksize-default.sh | 1 +
tests/test-blocksize-error-policy.sh | 1 +
tests/test-blocksize-extents.sh | 1 +
tests/test-blocksize-policy.sh | 1 +
tests/test-blocksize-sharding.sh | 1 +
tests/test-blocksize-write-disconnect.sh | 1 +
tests/test-cc-cpp.sh | 1 +
tests/test-cc-ocaml.sh | 1 +
tests/test-cc.sh | 1 +
tests/test-cow-block-size.sh | 1 +
tests/test-cow.sh | 1 +
tests/test-curl-file.sh | 1 +
tests/test-curl-header-script-fail.sh | 1 +
tests/test-eflags.sh | 1 +
tests/test-eval-cache.sh | 1 +
tests/test-eval-exports.sh | 1 +
tests/test-eval-file.sh | 1 +
tests/test-eval.sh | 1 +
tests/test-evil-cosmic.sh | 1 +
tests/test-evil-large-p.sh | 1 +
tests/test-evil-small-p.sh | 1 +
tests/test-exportname.sh | 1 +
tests/test-file-dir.sh | 1 +
tests/test-file-extents.sh | 1 +
tests/test-ip-filter-anyunix.sh | 1 +
tests/test-ip-filter-anyvsock.sh | 1 +
tests/test-ip-filter-gid.sh | 1 +
tests/test-ip-filter-uid.sh | 1 +
tests/test-linuxdisk-copy-out.sh | 1 +
tests/test-multi-conn-name.sh | 1 +
tests/test-multi-conn.sh | 1 +
tests/test-nbd-block-size.sh | 1 +
tests/test-nbd-extents.sh | 1 +
tests/test-nbd-vsock.sh | 1 +
tests/test-nozero.sh | 1 +
tests/test-old-plugins.sh | 1 +
tests/test-ondemand-list.sh | 1 +
tests/test-parallel-file.sh | 1 +
tests/test-parallel-nbd.sh | 1 +
tests/test-parallel-sh.sh | 1 +
tests/test-partition2.sh | 1 +
tests/test-qcow2dec-map.sh | 1 +
tests/test-qcow2dec.sh | 1 +
tests/test-readahead.sh | 1 +
tests/test-retry-extents.sh | 1 +
tests/test-retry-open.sh | 1 +
tests/test-retry-readonly.sh | 1 +
tests/test-retry-reopen-fail.sh | 1 +
tests/test-retry-request-open.sh | 1 +
tests/test-retry-request.sh | 1 +
tests/test-retry-size.sh | 1 +
tests/test-retry-zero-flags.sh | 1 +
tests/test-retry.sh | 1 +
tests/test-sh-errors.sh | 1 +
tests/test-sh-extents.sh | 1 +
tests/test-shebang-cc.sh | 1 +
tests/test-ssh.sh | 1 +
tests/test-stdio.sh | 1 +
tests/test-swab-extents.sh | 1 +
tests/test-tar-info-xz-qcow2dec.sh | 1 +
tests/test-tar-info-xz.sh | 1 +
tests/test-tar-info.sh | 1 +
tests/test-tls.sh | 1 +
tests/test-tmpdisk-command.sh | 1 +
tests/test-vddk-password-fd.sh | 1 +
tests/test-vddk-password-interactive.sh | 1 +
tests/test-vddk-real-create.sh | 1 +
tests/test-vddk-real.sh | 1 +
tests/test-vddk-reexec.sh | 1 +
tests/test-vddk-run.sh | 1 +
tests/test-vsock.sh | 1 +
75 files changed, 76 insertions(+)
diff --git a/plugins/rust/test-ramdisk.sh b/plugins/rust/test-ramdisk.sh
index a10f6300d..430ee5190 100755
--- a/plugins/rust/test-ramdisk.sh
+++ b/plugins/rust/test-ramdisk.sh
@@ -44,6 +44,8 @@ if is_windows; then
exit 77
fi
+requires_run
+
ramdisk=target/release/examples/libramdisk.so
requires test -x $ramdisk
diff --git a/tests/test-S3.sh b/tests/test-S3.sh
index ec2177704..047c931ca 100755
--- a/tests/test-S3.sh
+++ b/tests/test-S3.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires hexdump --version
requires $PYTHON --version
requires_nbdcopy
diff --git a/tests/test-blkio.sh b/tests/test-blkio.sh
index 4e45126de..31896ad96 100755
--- a/tests/test-blkio.sh
+++ b/tests/test-blkio.sh
@@ -39,6 +39,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin blkio
requires_nbdsh_uri
requires test -f disk
diff --git a/tests/test-block-size-constraints.sh b/tests/test-block-size-constraints.sh
index e282923da..692a918e9 100755
--- a/tests/test-block-size-constraints.sh
+++ b/tests/test-block-size-constraints.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin eval
requires nbdsh -c 'print(h.get_block_size)'
requires_nbdsh_uri
diff --git a/tests/test-blocksize-default.sh b/tests/test-blocksize-default.sh
index 2736a8a1c..c5df88bfb 100755
--- a/tests/test-blocksize-default.sh
+++ b/tests/test-blocksize-default.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin eval
requires nbdsh -c 'print(h.get_block_size)'
requires dd iflag=count_bytes </dev/null
diff --git a/tests/test-blocksize-error-policy.sh b/tests/test-blocksize-error-policy.sh
index 322c13762..44e9fd5cc 100755
--- a/tests/test-blocksize-error-policy.sh
+++ b/tests/test-blocksize-error-policy.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin eval
requires nbdsh -c 'print(h.get_block_size)'
requires nbdsh -c 'print(h.get_strict_mode)'
diff --git a/tests/test-blocksize-extents.sh b/tests/test-blocksize-extents.sh
index ceec66b9a..3fc452158 100755
--- a/tests/test-blocksize-extents.sh
+++ b/tests/test-blocksize-extents.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin eval
requires_nbdsh_uri
requires nbdsh --base-allocation
diff --git a/tests/test-blocksize-policy.sh b/tests/test-blocksize-policy.sh
index 50522c9c0..0b4895bd1 100755
--- a/tests/test-blocksize-policy.sh
+++ b/tests/test-blocksize-policy.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin eval
requires nbdsh -c 'print(h.get_block_size)'
requires_nbdsh_uri
diff --git a/tests/test-blocksize-sharding.sh b/tests/test-blocksize-sharding.sh
index 9ce328296..e3251e70b 100755
--- a/tests/test-blocksize-sharding.sh
+++ b/tests/test-blocksize-sharding.sh
@@ -37,6 +37,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin eval
requires_nbdsh_uri
requires dd oflag=seek_bytes </dev/null
diff --git a/tests/test-blocksize-write-disconnect.sh
b/tests/test-blocksize-write-disconnect.sh
index 1d3c1326c..ff8991fab 100755
--- a/tests/test-blocksize-write-disconnect.sh
+++ b/tests/test-blocksize-write-disconnect.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin eval
requires nbdsh -c 'print(h.get_block_size)'
requires nbdsh -c 'print(h.get_strict_mode)'
diff --git a/tests/test-cc-cpp.sh b/tests/test-cc-cpp.sh
index 7c7bf6353..c5751dcf9 100755
--- a/tests/test-cc-cpp.sh
+++ b/tests/test-cc-cpp.sh
@@ -43,6 +43,7 @@ if test ! -f "$script"; then
exit 1
fi
+requires_run
requires_plugin cc
requires $CXX --version
requires_nbdsh_uri
diff --git a/tests/test-cc-ocaml.sh b/tests/test-cc-ocaml.sh
index c6380d969..c17d0c23c 100755
--- a/tests/test-cc-ocaml.sh
+++ b/tests/test-cc-ocaml.sh
@@ -43,6 +43,7 @@ if test ! -f "$script"; then
exit 1
fi
+requires_run
requires_plugin cc
requires $OCAMLOPT -version
requires_nbdsh_uri
diff --git a/tests/test-cc.sh b/tests/test-cc.sh
index 5214327bd..f4f5644b7 100755
--- a/tests/test-cc.sh
+++ b/tests/test-cc.sh
@@ -43,6 +43,7 @@ if test ! -f "$script"; then
exit 1
fi
+requires_run
requires_plugin cc
requires_nbdsh_uri
requires_nbdinfo
diff --git a/tests/test-cow-block-size.sh b/tests/test-cow-block-size.sh
index 25dd86678..e6852d8d6 100755
--- a/tests/test-cow-block-size.sh
+++ b/tests/test-cow-block-size.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin linuxdisk
requires guestfish --version
requires_nbdcopy
diff --git a/tests/test-cow.sh b/tests/test-cow.sh
index a3a158003..5b137ff4d 100755
--- a/tests/test-cow.sh
+++ b/tests/test-cow.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin linuxdisk
requires guestfish --version
requires_nbdcopy
diff --git a/tests/test-curl-file.sh b/tests/test-curl-file.sh
index 7b993334a..0269768ed 100755
--- a/tests/test-curl-file.sh
+++ b/tests/test-curl-file.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires test -f disk
requires test -r /dev/null
requires_nbdinfo
diff --git a/tests/test-curl-header-script-fail.sh
b/tests/test-curl-header-script-fail.sh
index 2f3073564..1bd5f3dba 100755
--- a/tests/test-curl-header-script-fail.sh
+++ b/tests/test-curl-header-script-fail.sh
@@ -39,6 +39,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires test -f disk
requires_nbdinfo
diff --git a/tests/test-eflags.sh b/tests/test-eflags.sh
index 09f550016..4972c6260 100755
--- a/tests/test-eflags.sh
+++ b/tests/test-eflags.sh
@@ -42,6 +42,7 @@
source ./functions.sh
set -e
+requires_run
requires_plugin sh
requires qemu-nbd --version
diff --git a/tests/test-eval-cache.sh b/tests/test-eval-cache.sh
index b56bba050..fb3fc884a 100755
--- a/tests/test-eval-cache.sh
+++ b/tests/test-eval-cache.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin eval
requires_nbdsh_uri
requires dd iflag=count_bytes </dev/null
diff --git a/tests/test-eval-exports.sh b/tests/test-eval-exports.sh
index 6a21d4fd5..acb04bc63 100755
--- a/tests/test-eval-exports.sh
+++ b/tests/test-eval-exports.sh
@@ -37,6 +37,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin eval
requires_nbdinfo
requires_nbdsh_uri
diff --git a/tests/test-eval-file.sh b/tests/test-eval-file.sh
index c4fe8599f..ad787a88d 100755
--- a/tests/test-eval-file.sh
+++ b/tests/test-eval-file.sh
@@ -37,6 +37,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires guestfish --version
requires test -f disk
requires dd iflag=count_bytes </dev/null
diff --git a/tests/test-eval.sh b/tests/test-eval.sh
index cb2052117..6493ba61d 100755
--- a/tests/test-eval.sh
+++ b/tests/test-eval.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin eval
requires_nbdinfo
requires dd iflag=count_bytes </dev/null
diff --git a/tests/test-evil-cosmic.sh b/tests/test-evil-cosmic.sh
index 2e5e6ab24..50619966e 100755
--- a/tests/test-evil-cosmic.sh
+++ b/tests/test-evil-cosmic.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin null
requires_filter evil
requires_filter noextents
diff --git a/tests/test-evil-large-p.sh b/tests/test-evil-large-p.sh
index 0fcd9de4c..e9a25b3fc 100755
--- a/tests/test-evil-large-p.sh
+++ b/tests/test-evil-large-p.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin null
requires_filter evil
requires_filter noextents
diff --git a/tests/test-evil-small-p.sh b/tests/test-evil-small-p.sh
index 7b56cd135..5f2956147 100755
--- a/tests/test-evil-small-p.sh
+++ b/tests/test-evil-small-p.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin null
requires_filter evil
requires_filter noextents
diff --git a/tests/test-exportname.sh b/tests/test-exportname.sh
index 63a400849..606a0e998 100755
--- a/tests/test-exportname.sh
+++ b/tests/test-exportname.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin sh
requires_nbdinfo
requires_nbdsh_uri
diff --git a/tests/test-file-dir.sh b/tests/test-file-dir.sh
index 698d88baf..98a5e77e1 100755
--- a/tests/test-file-dir.sh
+++ b/tests/test-file-dir.sh
@@ -43,6 +43,7 @@ if is_windows; then
exit 77
fi
+requires_run
requires_nbdinfo
requires_nbdsh_uri
requires nbdsh -c 'print(h.set_full_info)'
diff --git a/tests/test-file-extents.sh b/tests/test-file-extents.sh
index 3d7d2b6ef..e3900b0a7 100755
--- a/tests/test-file-extents.sh
+++ b/tests/test-file-extents.sh
@@ -38,6 +38,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires test -f disk
requires jq --version
requires qemu-img --version
diff --git a/tests/test-ip-filter-anyunix.sh b/tests/test-ip-filter-anyunix.sh
index b17af0115..9b94dc969 100755
--- a/tests/test-ip-filter-anyunix.sh
+++ b/tests/test-ip-filter-anyunix.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_nbdinfo
# Not supported on Windows.
diff --git a/tests/test-ip-filter-anyvsock.sh b/tests/test-ip-filter-anyvsock.sh
index 078299304..4fb3b6a4c 100755
--- a/tests/test-ip-filter-anyvsock.sh
+++ b/tests/test-ip-filter-anyvsock.sh
@@ -42,6 +42,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_nbdinfo
requires nbdsh --version
requires nbdsh -c 'print(h.connect_vsock)'
diff --git a/tests/test-ip-filter-gid.sh b/tests/test-ip-filter-gid.sh
index 3e3af7cd9..8d9ee1eb0 100755
--- a/tests/test-ip-filter-gid.sh
+++ b/tests/test-ip-filter-gid.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_nbdinfo
# Not supported on Windows.
diff --git a/tests/test-ip-filter-uid.sh b/tests/test-ip-filter-uid.sh
index 610297ae5..b942345a5 100755
--- a/tests/test-ip-filter-uid.sh
+++ b/tests/test-ip-filter-uid.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_nbdinfo
# Not supported on Windows.
diff --git a/tests/test-linuxdisk-copy-out.sh b/tests/test-linuxdisk-copy-out.sh
index 3c4bcc079..492b6d069 100755
--- a/tests/test-linuxdisk-copy-out.sh
+++ b/tests/test-linuxdisk-copy-out.sh
@@ -37,6 +37,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin linuxdisk
requires guestfish --version
requires_nbdcopy
diff --git a/tests/test-multi-conn-name.sh b/tests/test-multi-conn-name.sh
index ceaf5dba7..c3657d482 100755
--- a/tests/test-multi-conn-name.sh
+++ b/tests/test-multi-conn-name.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin sh
requires_nbdsh_uri
requires nbdsh -c 'print(h.set_opt_mode)'
diff --git a/tests/test-multi-conn.sh b/tests/test-multi-conn.sh
index acd12989a..6ce863dfe 100755
--- a/tests/test-multi-conn.sh
+++ b/tests/test-multi-conn.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin sh
requires_nbdsh_uri
requires dd iflag=count_bytes </dev/null
diff --git a/tests/test-nbd-block-size.sh b/tests/test-nbd-block-size.sh
index 6c2c53c92..c6971edf3 100755
--- a/tests/test-nbd-block-size.sh
+++ b/tests/test-nbd-block-size.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin eval
requires_plugin nbd
requires nbdsh -c 'print(h.get_block_size)'
diff --git a/tests/test-nbd-extents.sh b/tests/test-nbd-extents.sh
index d6fc26167..e91f19b1c 100755
--- a/tests/test-nbd-extents.sh
+++ b/tests/test-nbd-extents.sh
@@ -38,6 +38,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires jq --version
requires qemu-img --version
requires qemu-img map --help
diff --git a/tests/test-nbd-vsock.sh b/tests/test-nbd-vsock.sh
index d4949cac2..63fbedb93 100755
--- a/tests/test-nbd-vsock.sh
+++ b/tests/test-nbd-vsock.sh
@@ -44,6 +44,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_nbdsh_uri
requires nbdsh -c 'print(h.connect_vsock)'
requires_linux_kernel_version 5.6
diff --git a/tests/test-nozero.sh b/tests/test-nozero.sh
index 3728df403..4cd834398 100755
--- a/tests/test-nozero.sh
+++ b/tests/test-nozero.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires $STAT --version
sock2=$(mktemp -u /tmp/nbdkit-test-sock.XXXXXX)
diff --git a/tests/test-old-plugins.sh b/tests/test-old-plugins.sh
index 7fc958064..fd593a17d 100755
--- a/tests/test-old-plugins.sh
+++ b/tests/test-old-plugins.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires guestfish --version
requires $CUT --version
requires test -f disk
diff --git a/tests/test-ondemand-list.sh b/tests/test-ondemand-list.sh
index 5cff0cb19..bc264c7df 100755
--- a/tests/test-ondemand-list.sh
+++ b/tests/test-ondemand-list.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin ondemand
requires qemu-nbd --version
requires bash -c 'qemu-nbd --help | grep -- --list'
diff --git a/tests/test-parallel-file.sh b/tests/test-parallel-file.sh
index add60007a..476a5f669 100755
--- a/tests/test-parallel-file.sh
+++ b/tests/test-parallel-file.sh
@@ -32,6 +32,7 @@
source ./functions.sh
+requires_run
requires test -f file-data
requires qemu-io --version
requires timeout 60s true
diff --git a/tests/test-parallel-nbd.sh b/tests/test-parallel-nbd.sh
index 3467e9f98..c2055e80f 100755
--- a/tests/test-parallel-nbd.sh
+++ b/tests/test-parallel-nbd.sh
@@ -32,6 +32,7 @@
source ./functions.sh
+requires_run
requires test -f file-data
requires qemu-io --version
requires timeout 60s true
diff --git a/tests/test-parallel-sh.sh b/tests/test-parallel-sh.sh
index fae44e537..08fd8a630 100755
--- a/tests/test-parallel-sh.sh
+++ b/tests/test-parallel-sh.sh
@@ -32,6 +32,7 @@
source ./functions.sh
+requires_run
requires test -f file-data
requires qemu-io --version
requires timeout 60s true
diff --git a/tests/test-partition2.sh b/tests/test-partition2.sh
index 6ad8a81e3..f195bc78e 100755
--- a/tests/test-partition2.sh
+++ b/tests/test-partition2.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_nbdinfo
requires test -f disk
diff --git a/tests/test-qcow2dec-map.sh b/tests/test-qcow2dec-map.sh
index 1b5ee509b..dc451a02a 100755
--- a/tests/test-qcow2dec-map.sh
+++ b/tests/test-qcow2dec-map.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires test -f disk
requires_nbdinfo
requires qemu-img --version
diff --git a/tests/test-qcow2dec.sh b/tests/test-qcow2dec.sh
index d6ca253d1..0c6a759f3 100755
--- a/tests/test-qcow2dec.sh
+++ b/tests/test-qcow2dec.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires test -f disk
requires_nbdcopy
requires_nbdinfo
diff --git a/tests/test-readahead.sh b/tests/test-readahead.sh
index 3f4a3f729..267d7678d 100755
--- a/tests/test-readahead.sh
+++ b/tests/test-readahead.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin sh
requires_nbdsh_uri
requires dd iflag=count_bytes </dev/null
diff --git a/tests/test-retry-extents.sh b/tests/test-retry-extents.sh
index 7f2f3980f..6df977fa4 100755
--- a/tests/test-retry-extents.sh
+++ b/tests/test-retry-extents.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin sh
requires_nbdsh_uri
requires nbdsh --base-allocation
diff --git a/tests/test-retry-open.sh b/tests/test-retry-open.sh
index 6180444e7..4a74d5d42 100755
--- a/tests/test-retry-open.sh
+++ b/tests/test-retry-open.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin sh
requires qemu-io --version
diff --git a/tests/test-retry-readonly.sh b/tests/test-retry-readonly.sh
index 5c9cf128b..985ac8b92 100755
--- a/tests/test-retry-readonly.sh
+++ b/tests/test-retry-readonly.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin sh
requires qemu-io --version
diff --git a/tests/test-retry-reopen-fail.sh b/tests/test-retry-reopen-fail.sh
index 5f332e024..65ecbdca7 100755
--- a/tests/test-retry-reopen-fail.sh
+++ b/tests/test-retry-reopen-fail.sh
@@ -39,6 +39,7 @@ set -x
fail=0
+requires_run
requires_plugin sh
requires qemu-io --version
requires dd iflag=count_bytes </dev/null
diff --git a/tests/test-retry-request-open.sh b/tests/test-retry-request-open.sh
index f2d56f7d6..bb60374b1 100755
--- a/tests/test-retry-request-open.sh
+++ b/tests/test-retry-request-open.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin sh
requires_nbdcopy
requires dd iflag=count_bytes </dev/null
diff --git a/tests/test-retry-request.sh b/tests/test-retry-request.sh
index 27bfbdda3..e821eebe6 100755
--- a/tests/test-retry-request.sh
+++ b/tests/test-retry-request.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin sh
requires_nbdcopy
requires dd iflag=count_bytes </dev/null
diff --git a/tests/test-retry-size.sh b/tests/test-retry-size.sh
index 47b592cd6..e0d22a3d3 100755
--- a/tests/test-retry-size.sh
+++ b/tests/test-retry-size.sh
@@ -36,6 +36,7 @@ set -x
fail=0
+requires_run
requires_plugin sh
requires_nbdsh_uri
requires dd iflag=count_bytes </dev/null
diff --git a/tests/test-retry-zero-flags.sh b/tests/test-retry-zero-flags.sh
index 30cde95d5..eff60925b 100755
--- a/tests/test-retry-zero-flags.sh
+++ b/tests/test-retry-zero-flags.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin sh
requires_nbdsh_uri
requires nbdsh -c 'i = nbd.CMD_FLAG_FAST_ZERO'
diff --git a/tests/test-retry.sh b/tests/test-retry.sh
index 705201657..67708cf13 100755
--- a/tests/test-retry.sh
+++ b/tests/test-retry.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin sh
requires_nbdcopy
requires dd iflag=count_bytes </dev/null
diff --git a/tests/test-sh-errors.sh b/tests/test-sh-errors.sh
index 74a5a0ece..2b05c7baa 100755
--- a/tests/test-sh-errors.sh
+++ b/tests/test-sh-errors.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin sh
requires qemu-io --version
diff --git a/tests/test-sh-extents.sh b/tests/test-sh-extents.sh
index f8a06b098..e6a15073b 100755
--- a/tests/test-sh-extents.sh
+++ b/tests/test-sh-extents.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin sh
requires jq --version
requires qemu-img --version
diff --git a/tests/test-shebang-cc.sh b/tests/test-shebang-cc.sh
index a5e557648..e1f1e9fbe 100755
--- a/tests/test-shebang-cc.sh
+++ b/tests/test-shebang-cc.sh
@@ -41,6 +41,7 @@ if test ! -f "$script"; then
exit 1
fi
+requires_run
requires_plugin cc
requires guestfish --version
diff --git a/tests/test-ssh.sh b/tests/test-ssh.sh
index 035108070..eccab1518 100755
--- a/tests/test-ssh.sh
+++ b/tests/test-ssh.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires test -f disk
requires_nbdcopy
requires $STAT --version
diff --git a/tests/test-stdio.sh b/tests/test-stdio.sh
index c55ff2ab5..b8c18a82a 100755
--- a/tests/test-stdio.sh
+++ b/tests/test-stdio.sh
@@ -33,6 +33,7 @@
source ./functions.sh
set -xe
+requires_run
requires_nbdsh_uri
plugin=.libs/test-stdio-plugin.$SOEXT
diff --git a/tests/test-swab-extents.sh b/tests/test-swab-extents.sh
index f4ea9f0e9..68fd3bdcb 100755
--- a/tests/test-swab-extents.sh
+++ b/tests/test-swab-extents.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin eval
requires_nbdsh_uri
requires nbdsh --base-allocation
diff --git a/tests/test-tar-info-xz-qcow2dec.sh b/tests/test-tar-info-xz-qcow2dec.sh
index b1e1cd97c..f8a4f54c7 100755
--- a/tests/test-tar-info-xz-qcow2dec.sh
+++ b/tests/test-tar-info-xz-qcow2dec.sh
@@ -37,6 +37,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires test -f disk
requires tar --version
requires qemu-img --version
diff --git a/tests/test-tar-info-xz.sh b/tests/test-tar-info-xz.sh
index abd854974..064ee8eba 100755
--- a/tests/test-tar-info-xz.sh
+++ b/tests/test-tar-info-xz.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires test -f disk
requires tar --version
requires qemu-img --version
diff --git a/tests/test-tar-info.sh b/tests/test-tar-info.sh
index 5c015d88e..3f98999db 100755
--- a/tests/test-tar-info.sh
+++ b/tests/test-tar-info.sh
@@ -36,6 +36,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires test -f disk
requires tar --version
requires qemu-img --version
diff --git a/tests/test-tls.sh b/tests/test-tls.sh
index 5043456b4..cf570a9ec 100755
--- a/tests/test-tls.sh
+++ b/tests/test-tls.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires qemu-img --version
if ! qemu-img --help | grep -- --object; then
diff --git a/tests/test-tmpdisk-command.sh b/tests/test-tmpdisk-command.sh
index da0b8f9ed..4254d20ce 100755
--- a/tests/test-tmpdisk-command.sh
+++ b/tests/test-tmpdisk-command.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_plugin tmpdisk
requires_nbdsh_uri
diff --git a/tests/test-vddk-password-fd.sh b/tests/test-vddk-password-fd.sh
index 2b251f142..1ccaee070 100755
--- a/tests/test-vddk-password-fd.sh
+++ b/tests/test-vddk-password-fd.sh
@@ -41,6 +41,7 @@ set -e
set -x
skip_if_valgrind "because setting LD_LIBRARY_PATH breaks valgrind"
+requires_run
requires_nbdinfo
f=test-vddk-password-fd.file
diff --git a/tests/test-vddk-password-interactive.sh
b/tests/test-vddk-password-interactive.sh
index 21b4baf3a..f9173da7b 100755
--- a/tests/test-vddk-password-interactive.sh
+++ b/tests/test-vddk-password-interactive.sh
@@ -41,6 +41,7 @@ set -e
set -x
skip_if_valgrind "because setting LD_LIBRARY_PATH breaks valgrind"
+requires_run
requires_nbdinfo
requires expect -v
diff --git a/tests/test-vddk-real-create.sh b/tests/test-vddk-real-create.sh
index 84155e439..422bbcec8 100755
--- a/tests/test-vddk-real-create.sh
+++ b/tests/test-vddk-real-create.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires test "x$vddkdir" != "x"
requires test -d "$vddkdir"
requires test -f "$vddkdir/lib64/libvixDiskLib.so"
diff --git a/tests/test-vddk-real.sh b/tests/test-vddk-real.sh
index 0b189665b..667b6fc20 100755
--- a/tests/test-vddk-real.sh
+++ b/tests/test-vddk-real.sh
@@ -34,6 +34,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires test "x$vddkdir" != "x"
requires test -d "$vddkdir"
requires test -f "$vddkdir/lib64/libvixDiskLib.so"
diff --git a/tests/test-vddk-reexec.sh b/tests/test-vddk-reexec.sh
index 14cbf4933..939bf1fb3 100755
--- a/tests/test-vddk-reexec.sh
+++ b/tests/test-vddk-reexec.sh
@@ -35,6 +35,7 @@ set -e
set -x
skip_if_valgrind "because setting LD_LIBRARY_PATH breaks valgrind"
+requires_run
# We ensure that LD_LIBRARY_PATH in the child is not further modified,
# even if nbdkit had to re-exec. It's tricky, though: when running
diff --git a/tests/test-vddk-run.sh b/tests/test-vddk-run.sh
index c37ef4722..260c94bef 100755
--- a/tests/test-vddk-run.sh
+++ b/tests/test-vddk-run.sh
@@ -37,6 +37,7 @@ set -e
set -x
skip_if_valgrind "because setting LD_LIBRARY_PATH breaks valgrind"
+requires_run
requires_nbdinfo
out=test-vddk-run.out
diff --git a/tests/test-vsock.sh b/tests/test-vsock.sh
index 5c71a04ab..43cf18423 100755
--- a/tests/test-vsock.sh
+++ b/tests/test-vsock.sh
@@ -42,6 +42,7 @@ source ./functions.sh
set -e
set -x
+requires_run
requires_nbdinfo
requires nbdsh --version
requires nbdsh -c 'print(h.connect_vsock)'
--
2.41.0