search for: c4f3b63

...EXIT ERR - echo $0: cleanup: exit code $status - kill $pid rm -f tls.pid tls.out - - exit $status } -trap cleanup INT QUIT TERM EXIT ERR +cleanup_fn cleanup # Run qemu-img against the server. LANG=C \ diff --git a/tests/test-truncate1.sh b/tests/test-truncate1.sh index 719f63b..c4f3b63 100755 --- a/tests/test-truncate1.sh +++ b/tests/test-truncate1.sh @@ -33,6 +33,7 @@ # Test the truncate filter using the pattern plugin. +source ./functions.sh set -e set -x @@ -68,16 +69,10 @@ pid="$(cat truncate1.pid)" # Kill the nbdkit process on exit. cleanup () { - st...

v1 was here: https://www.redhat.com/archives/libguestfs/2018-September/msg00057.html v2: - Fix tab vs spaces in configure.ac. - To generate list of plugins, use printf instead of xargs. - Use 'source ./functions.sh' instead of 'source functions'. - functions.sh: Consistent quoting in foreach_plugin function. - functions.sh: Change the contract of start_nbdkit so it

...uot; - exit 1 -fi - -pid="$(cat tls.pid)" - -# Kill the process on exit. -cleanup () -{ - kill $pid - rm -f tls.pid tls.out -} -cleanup_fn cleanup - # Run qemu-img against the server. LANG=C \ qemu-img info \ diff --git a/tests/test-truncate1.sh b/tests/test-truncate1.sh index c4f3b63..eb02a69 100755 --- a/tests/test-truncate1.sh +++ b/tests/test-truncate1.sh @@ -39,6 +39,7 @@ set -x files="truncate1.out truncate1.pid truncate1.sock" rm -f $files +cleanup_fn rm -f $files # Test that qemu-io works if ! qemu-io --help >/dev/null; then @@ -47,33 +48,11 @@ if !...