Re: [Libguestfs] [PATCH v2 nbdkit] tests: Add generic ‘requires’ function for test prerequisites.

> +++ b/tests/test-ip.sh > @@ -37,26 +37,17 @@ > source ./functions.sh > set -e > > -rm -f ip.pid ipv4.out ipv6.out > -cleanup_fn rm -f ip.pid ipv4.out ipv6.out > +requires ss --version > +requires ip -V > +requires qemu-img --version > > -# Don't fail if certain commands aren't available. > -if ! ss --version; then > - echo "$0: 'ss' command not available" > - exit 77 > -fi > -if ! command -v qemu-img; then > - echo "$0: 'qemu-img' command not available" > - exit 77 > -fi > if ! qemu-img --help | grep -- --image-opts; then > echo "$0: 'qemu-img' command does not have the --image-opts option" > exit 77 The old test insists on --image-opts, > fi > -if ! ip -V; then > - echo "$0: 'ip' command not available" > - exit 77 > -fi > + > +rm -f ip.pid ipv4.out ipv6.out > +cleanup_fn rm -f ip.pid ipv4.out ipv6.out ...but the rewrite does not. Could be solved with: requires qemu-img info --image-opts driver=file,filename=functions.sh

> +++ b/tests/test-partitioning2.sh > @@ -40,16 +40,12 @@ source ./functions.sh > set -e > set -x > > +requires mke2fs -V > + > files="partitioning2.pid partitioning2.sock partitioning2.fs partitioning2.p1 partitioning2.p3" > rm -f $files > cleanup_fn rm -f $files > > -# Test that mke2fs works > -if ! mke2fs -V; then > - echo "$0: missing or broken mke2fs" > - exit 77 > -fi > - > # Create partitions before and after. > truncate -s 1 partitioning2.p1 'truncate' is not universally available; that may be something for a future patch to add a requires line for (but not this patch, which should be just the mechanical rewrites).