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)
This commit is contained in:
Richard W.M. Jones
2025-02-13 10:32:59 +00:00
parent 82e2dea96a
commit b5fbc7e617
114 changed files with 255 additions and 147 deletions

View File

@@ -90,24 +90,3 @@ if HAVE_OCAMLOPT
%.cmx: %.ml
$(guestfs_am_v_ocamlopt)$(OCAMLFIND) ocamlopt $(OCAMLFLAGS) $(OCAMLPACKAGES) -c $< -o $@
endif
# Test shell scripts should use '$TEST_FUNCTIONS' to get a predefined
# set of helper functions for running tests (see
# tests/test-functions.sh).
#
# Notes:
#
# (1) This is in fact a single command all on one line. The variables
# are evaluated in test-functions.sh.
#
# (2) We use absolute paths here and in test-functions.sh so that the
# test can change directory freely. But we also include the
# non-absolute values so they can be used by the test script itself.
export TEST_FUNCTIONS := \
source $(abs_top_srcdir)/tests/test-functions.sh \
abs_srcdir="$(abs_srcdir)" \
abs_builddir="$(abs_builddir)" \
top_srcdir="$(top_srcdir)" \
top_builddir="$(top_builddir)" \
abs_top_srcdir="$(abs_top_srcdir)" \
abs_top_builddir="$(abs_top_builddir)"