tests: Replace $TEST_FUNCTIONS

Replace strange $TEST_FUNCTIONS variable/expansion thing with something more like what we use in nbdkit, a simple tests/functions.sh script that gets sourced into each test script. Update the common submodule to get: commit 8137d47d0e654065391151eb275e3b64f230f6f5 Author: Richard W.M. Jones <rjones@redhat.com> Date: Thu Feb 13 11:13:55 2025 +0000 mlcustomize, mltools: Replace $TEST_FUNCTIONS TEST_FUNCTIONS is being removed from libguestfs and guestfs-tools (it was removed from virt-v2v a while back). Make the same adjustment in the common submodule. (and some other commits which are not relevant to libguestfs)
2026-03-21 22:53:37 +00:00 · 2025-02-13 10:32:59 +00:00
parent 82e2dea96a
commit b5fbc7e617
114 changed files with 255 additions and 147 deletions
--- a/fish/test-a.sh
+++ b/fish/test-a.sh
@@ -18,9 +18,10 @@

 # Test guestfish -a option.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 rm -f test-a.out
--- a/fish/test-add-domain.sh
+++ b/fish/test-add-domain.sh
@@ -18,9 +18,10 @@

 # Test add-domain command.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 rm -f test-add-domain-{1,2,3,4}.img
--- a/fish/test-add-uri.sh
+++ b/fish/test-add-uri.sh
@@ -18,10 +18,10 @@

 # Test guestfish -a URI.

+source ../tests/functions.sh
 set -e
 set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 rm -f test-add-uri.out
--- a/fish/test-alloc.sh
+++ b/fish/test-alloc.sh
@@ -18,9 +18,10 @@

 # Test guestfish alloc and sparse commands.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 rm -f test-alloc.img
--- a/fish/test-copy.sh
+++ b/fish/test-copy.sh
@@ -18,9 +18,10 @@

 # Test guestfish copy-in and copy-out commands.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 # This test fails on some versions of mock which lack /dev/fd
--- a/fish/test-d.sh
+++ b/fish/test-d.sh
@@ -18,9 +18,10 @@

 # Test guestfish -d option.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 rm -f test-d-{1,2,3,4}.img
--- a/fish/test-docs.sh
+++ b/fish/test-docs.sh
@@ -16,9 +16,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 $top_srcdir/podcheck.pl "$srcdir/guestfish.pod" guestfish \
--- a/fish/test-edit.sh
+++ b/fish/test-edit.sh
@@ -18,9 +18,10 @@

 # Test guestfish edit command.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 # This test fails on some versions of mock which lack /dev/fd
--- a/fish/test-escapes.sh
+++ b/fish/test-escapes.sh
@@ -18,9 +18,10 @@

 # Test guestfish string escapes.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 rm -f test.output test.error test.error.old
--- a/fish/test-events.sh
+++ b/fish/test-events.sh
@@ -18,9 +18,10 @@

 # Test guestfish events.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 rm -f test-events.out
--- a/fish/test-file-attrs.sh
+++ b/fish/test-file-attrs.sh
@@ -18,9 +18,10 @@

 # Test guestfish file attributes commands (chmod, copy-attributes, etc).

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 rm -f test-file-attrs.out
--- a/fish/test-find0.sh
+++ b/fish/test-find0.sh
@@ -18,9 +18,10 @@

 # Test find0 call.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped
 skip_unless_test_iso

--- a/fish/test-glob.sh
+++ b/fish/test-glob.sh
@@ -18,9 +18,10 @@

 # Test guestfish glob command.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 rm -f test-glob.img test-glob.out
--- a/fish/test-inspect.sh
+++ b/fish/test-inspect.sh
@@ -16,9 +16,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped
 skip_unless_phony_guest fedora.img

--- a/fish/test-invalid-params.sh
+++ b/fish/test-invalid-params.sh
@@ -19,9 +19,10 @@
 # Test passing invalid parameters for memory size, smp, etc when setting up
 # the appliance.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 # Memory size
--- a/fish/test-mount-local.sh
+++ b/fish/test-mount-local.sh
@@ -18,7 +18,10 @@

 # Test guestfish mount-local / mount-local-run commands.

-$TEST_FUNCTIONS
+source ../tests/functions.sh
+set -e
+set -x
+
 skip_if_skipped
 skip_unless_fuse

--- a/fish/test-read-file.sh
+++ b/fish/test-read-file.sh
@@ -18,9 +18,10 @@

 # Test read_file call.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped
 skip_unless_test_iso

--- a/fish/test-remote-events.sh
+++ b/fish/test-remote-events.sh
@@ -18,9 +18,10 @@

 # Test remote events in guestfish.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 eval "$(guestfish --listen)"
--- a/fish/test-remote.sh
+++ b/fish/test-remote.sh
@@ -18,9 +18,10 @@

 # Test remote control of guestfish.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 rm -f test-remote.img
--- a/fish/test-reopen.sh
+++ b/fish/test-reopen.sh
@@ -19,9 +19,10 @@
 # Test reopening the handle in the same process.  This used to fail
 # but was corrected in 03e1f74ee08dc71bc09cc7655bf4732685f80b43.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 rm -f test-reopen.img
--- a/fish/test-run.sh
+++ b/fish/test-run.sh
@@ -16,9 +16,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped
 skip_unless_phony_guest fedora.img

--- a/fish/test-stringlist.sh
+++ b/fish/test-stringlist.sh
@@ -18,9 +18,10 @@

 # Test remote control of guestfish.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 rm -f test-stringlist.img
--- a/fish/test-tilde.sh
+++ b/fish/test-tilde.sh
@@ -21,9 +21,10 @@
 # RHBZ#511372 guestfish doesn't understand '~' in filenames
 # and multiple other fixes to tilde handling.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped

 # Set XDG_CACHE_HOME correctly, unless set already.  See:
--- a/fish/test-upload-to-dir.sh
+++ b/fish/test-upload-to-dir.sh
@@ -20,9 +20,10 @@
 # target to a directory instead of the full filename, then previously
 # libguestfs would hang.  It should return an error instead.

+source ../tests/functions.sh
 set -e
+set -x

-$TEST_FUNCTIONS
 skip_if_skipped
 skip_unless_test_iso