[Libguestfs] [libnbd PATCH 04/20] tests: Fix hexdump probing

Martin Kletzander mkletzan at redhat.com
Tue Jun 8 07:53:45 UTC 2021


It does not support `--version` parameter (at least on some platforms).

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
 copy/copy-nbd-to-file.sh | 2 +-
 copy/copy-nbd-to-nbd.sh  | 2 +-
 copy/copy-tls.sh         | 2 +-
 fuse/test-pattern.sh     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/copy/copy-nbd-to-file.sh b/copy/copy-nbd-to-file.sh
index a7d37303e05f..33f215adcdff 100755
--- a/copy/copy-nbd-to-file.sh
+++ b/copy/copy-nbd-to-file.sh
@@ -22,7 +22,7 @@ set -e
 set -x
 
 requires nbdkit --exit-with-parent --version
-requires hexdump --version
+requires hexdump -C /dev/null
 requires stat --version
 
 file=copy-nbd-to-file.file
diff --git a/copy/copy-nbd-to-nbd.sh b/copy/copy-nbd-to-nbd.sh
index 9afddadd621c..60c535256091 100755
--- a/copy/copy-nbd-to-nbd.sh
+++ b/copy/copy-nbd-to-nbd.sh
@@ -23,7 +23,7 @@ set -x
 
 requires nbdkit --exit-with-parent --version
 requires cmp /dev/null /dev/null
-requires hexdump --version
+requires hexdump -C /dev/null
 
 pidfile1=copy-nbd-to-nbd.pid1
 pidfile2=copy-nbd-to-nbd.pid2
diff --git a/copy/copy-tls.sh b/copy/copy-tls.sh
index 0352a05f168f..a9183b7854d7 100755
--- a/copy/copy-tls.sh
+++ b/copy/copy-tls.sh
@@ -29,7 +29,7 @@ requires test "x$PSKTOOL" != "x"
 requires nbdkit --exit-with-parent --version
 requires bash -c "nbdkit --dump-config | grep tls=yes"
 requires cmp /dev/null /dev/null
-requires hexdump --version
+requires hexdump -C /dev/null
 
 pskfile=copy-tls.psk
 pidfile1=copy-tls.pid1
diff --git a/fuse/test-pattern.sh b/fuse/test-pattern.sh
index 44ecaa204bf6..f32f9d093285 100755
--- a/fuse/test-pattern.sh
+++ b/fuse/test-pattern.sh
@@ -27,7 +27,7 @@ set -x
 requires fusermount3 --version
 requires dd --version
 requires dd iflag=count_bytes,skip_bytes </dev/null
-requires hexdump --version
+requires hexdump -C /dev/null
 requires nbdkit --version
 requires nbdkit pattern --version
 
-- 
2.31.1




More information about the Libguestfs mailing list