tests: Replace $TEST_FUNCTIONS

The same change as in this libguestfs commit:
libguestfs/libguestfs@b5fbc7e

Also update the common submodule to get:

  commit 8137d47d0e654065391151eb275e3b64f230f6f5
  Author: Richard W.M. Jones <[email protected]>
  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.

  commit a4d620ddef0feee290e72924c245d98952ad3b0c
  Merge: 2bb8c83 91d89a5
  Author: rwmjones <[email protected]>
  Date:   Wed Feb 12 21:59:29 2025 +0000

    Merge pull request #7 from crobinso/remove-remove

    mldrivers/linux.ml: delete `Remove`

  commit 91d89a574ee6aeeb7f61c58c9e223fdb29de8459
  Author: Cole Robinson <[email protected]>
  Date:   Wed Feb 12 16:44:09 2025 -0500

    mldrivers/linux.ml: delete `Remove`

    Last usages were removed in
    libguestfs/virt-v2v@b3268a1

    Signed-off-by: Cole Robinson <[email protected]>

  commit 2bb8c83c1ce5d10d35e5470464e4b9de5034673b
  Merge: 40bfeed 3831560
  Author: rwmjones <[email protected]>
  Date:   Sun Feb 9 17:33:27 2025 +0000

    Merge pull request #6 from rwmjones/RHEL-77989

    mldrivers/linux_bootloaders.ml: Don't overwrite EFI grub2 wrapper

  commit 38315604596ac747e44e38db79496610efee49f8
  Author: Richard W.M. Jones <[email protected]>
  Date:   Thu Feb 6 08:04:38 2025 +0000

    mldrivers/linux_bootloaders.ml: Don't overwrite EFI grub2 wrapper

    Fedora 34+ and RHEL 9.0+ unified BIOS and UEFI grub configuration into
    a single file.  This leaves /boot/efi/EFI/<OS>/grub.cfg as a so-called
    "wrapper" which just loads the real grub2 configuration at
    /boot/grub2/grub.cfg.

    Running '/sbin/grub2-mkconfig -o /boot/efi/EFI/<OS>/grub.cfg'
    overwrites the wrapper instead of the real configuration file.

    RHEL 9.5 added a hard error if you try to do this, which broke
    virt-v2v.  The error message was:

      commandrvf: /sbin/grub2-mkconfig -o /boot/efi/EFI/redhat/grub.cfg
      Running `grub2-mkconfig -o /boot/efi/EFI/redhat/grub.cfg' will
      overwrite the GRUB wrapper.  Please run `grub2-mkconfig -o
      /boot/grub2/grub.cfg' instead to update grub.cfg.

    Try to detect this situation and substitute the real grub
    configuration file instead.

    Reported-by: Robert Knipp, Fabian Deutsch
    Thanks: Nijin Ashok, Marta Lewandowska
    Fixes: https://issues.redhat.com/browse/RHEL-77989
    Related: https://issues.redhat.com/browse/RHEL-32099
    Related: https://fedoraproject.org/wiki/Changes/UnifyGrubConfig

  commit 40bfeed7339b830ce5bd9526599acad36e73f74d
  Author: Richard W.M. Jones <[email protected]>
  Date:   Thu Feb 6 08:04:18 2025 +0000

    mldrivers/linux_bootloaders.ml: Fix comment style

Author: rwmjones

.gitignore

@@ -149,5 +149,6 @@ Makefile.in
 /test-data/phony-guests/windows.img
 /test-data/phony-guests/windows-software
 /test-data/phony-guests/windows-system
+/tests/functions.sh
 /website/*.html
 /win-reg/virt-win-reg

Makefile.am

@@ -47,6 +47,9 @@ endif
 # Data used by the tests.
 SUBDIRS += test-data
 
+# Not used but needed.
+SUBDIRS += tests
+
 # virt-tools in C.
 SUBDIRS += align cat diff df edit format inspector make-fs
 

align/test-virt-alignment-scan-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/virt-alignment-scan.pod" virt-alignment-scan \

align/test-virt-alignment-scan-guests.sh

@@ -16,7 +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.
 
-$TEST_FUNCTIONS
+source ../tests/functions.sh
+# set -e    # command below fails
+set -x
+
 skip_if_skipped
 
 libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests-all-good.xml"

align/test-virt-alignment-scan.sh

@@ -16,7 +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.
 
-$TEST_FUNCTIONS
+source ../tests/functions.sh
+# set -e    # command below fails
+set -x
+
 skip_if_skipped
 
 $VG virt-alignment-scan --format=raw -a ../test-data/phony-guests/fedora.img

bash/test-complete-in-script.sh

@@ -19,7 +19,10 @@
 # Test that the correct 'complete' command is included in the script.
 # Mainly prevents symlinking errors and some omissions.
 
-$TEST_FUNCTIONS
+source ../tests/functions.sh
+set -e
+set -x
+
 skip_if_skipped
 
 if [ -z "$commands" ]; then

builder/test-console.sh

@@ -24,11 +24,12 @@
 # The script currently assumes a Linux guest.  We should test Windows,
 # FreeBSD in future (XXX).
 
+source ../tests/functions.sh
 set -e
+set -x
 
-$TEST_FUNCTIONS
-slow_test
 skip_if_skipped "$script"
+slow_test
 
 guestname="$1"
 if [ -z "$guestname" ]; then

builder/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/virt-builder.pod" virt-builder \

builder/test-virt-builder-cacheall.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
 
 tmpdir="$(mktemp -d)"

builder/test-virt-builder-list-simplestreams.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
 
 export XDG_CONFIG_HOME=

builder/test-virt-builder-list.sh

@@ -18,9 +18,10 @@
 
 # Test the virt-builder --list [--long] options.
 
+source ../tests/functions.sh
 set -e
+set -x
 
-$TEST_FUNCTIONS
 skip_if_skipped
 
 export XDG_CONFIG_HOME=

builder/test-virt-builder-planner.sh

@@ -18,9 +18,12 @@
 
 set -e
 
-$TEST_FUNCTIONS
-slow_test
+source ../tests/functions.sh
+set -e
+set -x
+
 skip_if_skipped
+slow_test
 
 export XDG_CONFIG_HOME=
 export VIRT_BUILDER_DIRS="$abs_builddir/test-config"

builder/test-virt-builder-repository.sh

@@ -18,9 +18,12 @@
 
 set -e
 
-$TEST_FUNCTIONS
-slow_test
+source ../tests/functions.sh
+set -e
+set -x
+
 skip_if_skipped "$script"
+slow_test
 
 test_data=repository-testdata
 rm -rf $test_data

builder/test-virt-builder.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
 
 export XDG_CONFIG_HOME=

cat/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/virt-cat.pod" virt-cat \

cat/test-virt-cat.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
 
 # Read out the test files from the image using virt-cat.

cat/test-virt-filesystems.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
 
 output="$($VG virt-filesystems --format=raw -a ../test-data/phony-guests/fedora.img | sort)"

cat/test-virt-log.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
 
 can_handle ()

cat/test-virt-ls.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
 
 # Read out the test directory using virt-ls.

cat/test-virt-tail.sh

@@ -21,10 +21,10 @@
 # in the guestfish instance we append to the file, and we check that
 # the addenda are displayed by virt-tail.
 
+source ../tests/functions.sh
 set -e
 set -x
 
-$TEST_FUNCTIONS
 skip_if_skipped
 
 # Libvirt screws with the SELinux labels, preventing guestfish from

common

@@ -99,6 +99,8 @@ AC_CONFIG_FILES([podwrapper.pl],
                 [chmod +x,-w podwrapper.pl])
 AC_CONFIG_FILES([run],
                 [chmod +x,-w run])
+AC_CONFIG_FILES([tests/functions.sh],
+                [chmod +x,-w tests/functions.sh])
 AC_CONFIG_FILES([win-reg/virt-win-reg],
                 [chmod +x,-w win-reg/virt-win-reg])
 
@@ -157,6 +159,7 @@ AC_CONFIG_FILES([Makefile
                  test-data/blank-disks/Makefile
                  test-data/phony-guests/Makefile
                  test-data/phony-guests/guests.xml
+                 tests/Makefile
                  win-reg/Makefile])
 
 AC_OUTPUT

configure.ac

@@ -21,10 +21,10 @@
 # NB. 'test-settings.sh' runs the tests, but the various tests are
 # run via the 'test-settings-GUESTNAME.sh' wrappers.
 
+source ../tests/functions.sh
 set -e
 set -x
 
-$TEST_FUNCTIONS
 slow_test
 skip_if_skipped "$script"
 

customize/test-settings.sh

@@ -16,9 +16,11 @@
 # 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/virt-customize.pod" virt-customize \
   --path $top_srcdir/common/options \

customize/test-virt-customize-docs.sh

@@ -16,10 +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
 

customize/test-virt-customize.sh

@@ -16,9 +16,11 @@
 # 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/virt-df.pod" virt-df \
                         --path $top_srcdir/common/options

df/test-virt-df-docs.sh

@@ -18,9 +18,10 @@
 
 # Run virt-df on the test guests.
 
+source ../tests/functions.sh
 set -e
+set -x
 
-$TEST_FUNCTIONS
 skip_if_skipped
 
 libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests.xml"

df/test-virt-df-guests.sh

@@ -16,9 +16,11 @@
 # 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
 
 # Run virt-df.
 output=$($VG virt-df --format=raw -a ../test-data/phony-guests/fedora.img)

df/test-virt-df.sh

@@ -16,9 +16,11 @@
 # 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/virt-diff.pod" virt-diff \
   --path $top_srcdir/common/options \

diff/test-virt-diff-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
 skip_unless_phony_guest fedora.img
 

diff/test-virt-diff.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/virt-drivers.pod" virt-drivers \

drivers/test-virt-drivers-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
 skip_unless_phony_guest fedora.img
 

drivers/test-virt-drivers-linux.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 windows.img