Skip to content

Commit fca1778

Browse files
committed
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
1 parent 556c75b commit fca1778

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+157
-84
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,5 +149,6 @@ Makefile.in
149149
/test-data/phony-guests/windows.img
150150
/test-data/phony-guests/windows-software
151151
/test-data/phony-guests/windows-system
152+
/tests/functions.sh
152153
/website/*.html
153154
/win-reg/virt-win-reg

Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ endif
4747
# Data used by the tests.
4848
SUBDIRS += test-data
4949

50+
# Not used but needed.
51+
SUBDIRS += tests
52+
5053
# virt-tools in C.
5154
SUBDIRS += align cat diff df edit format inspector make-fs
5255

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
# along with this program; if not, write to the Free Software
1717
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1818

19+
source ../tests/functions.sh
1920
set -e
21+
set -x
2022

21-
$TEST_FUNCTIONS
2223
skip_if_skipped
2324

2425
$top_srcdir/podcheck.pl "$srcdir/virt-alignment-scan.pod" virt-alignment-scan \

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
# along with this program; if not, write to the Free Software
1717
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1818

19-
$TEST_FUNCTIONS
19+
source ../tests/functions.sh
20+
# set -e # command below fails
21+
set -x
22+
2023
skip_if_skipped
2124

2225
libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests-all-good.xml"

align/test-virt-alignment-scan.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616
# along with this program; if not, write to the Free Software
1717
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1818

19-
$TEST_FUNCTIONS
19+
source ../tests/functions.sh
20+
# set -e # command below fails
21+
set -x
22+
2023
skip_if_skipped
2124

2225
$VG virt-alignment-scan --format=raw -a ../test-data/phony-guests/fedora.img

bash/test-complete-in-script.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
# Test that the correct 'complete' command is included in the script.
2020
# Mainly prevents symlinking errors and some omissions.
2121

22-
$TEST_FUNCTIONS
22+
source ../tests/functions.sh
23+
set -e
24+
set -x
25+
2326
skip_if_skipped
2427

2528
if [ -z "$commands" ]; then

builder/test-console.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424
# The script currently assumes a Linux guest. We should test Windows,
2525
# FreeBSD in future (XXX).
2626

27+
source ../tests/functions.sh
2728
set -e
29+
set -x
2830

29-
$TEST_FUNCTIONS
30-
slow_test
3131
skip_if_skipped "$script"
32+
slow_test
3233

3334
guestname="$1"
3435
if [ -z "$guestname" ]; then

builder/test-docs.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
# along with this program; if not, write to the Free Software
1717
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1818

19+
source ../tests/functions.sh
1920
set -e
21+
set -x
2022

21-
$TEST_FUNCTIONS
2223
skip_if_skipped
2324

2425
$top_srcdir/podcheck.pl "$srcdir/virt-builder.pod" virt-builder \

builder/test-virt-builder-cacheall.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
# along with this program; if not, write to the Free Software
1717
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1818

19+
source ../tests/functions.sh
1920
set -e
21+
set -x
2022

21-
$TEST_FUNCTIONS
2223
skip_if_skipped
2324

2425
tmpdir="$(mktemp -d)"

builder/test-virt-builder-list-simplestreams.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
# along with this program; if not, write to the Free Software
1717
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
1818

19+
source ../tests/functions.sh
1920
set -e
21+
set -x
2022

21-
$TEST_FUNCTIONS
2223
skip_if_skipped
2324

2425
export XDG_CONFIG_HOME=

0 commit comments

Comments
 (0)