bhyvexml2argvtest: use virCommandToStringFull to strip command path

Currently the tests would fail if the bhyve commands are installed in different path then /usr/bin. Strip the command path to not depend on the host environment. Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
2024-12-22 05:35:25 +00:00 · 2021-04-16 20:32:34 +02:00 · 2021-04-16 20:32:34 +02:00 · a6cc9e46fb
commit a6cc9e46fb
parent 7e88184b8e
89 changed files with 90 additions and 90 deletions
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -A \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd1.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd1.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd1.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/cdrom.iso \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/cdrom.iso \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -X \
 -Y \
 -Z
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c cpus=2,sockets=1,cores=2,threads=1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs
@ -1,4 +1,4 @@
-/fizz_buzz_bazz \
+fizz_buzz_bazz \
 -X \
 -Y \
 -Z
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
@ -1,4 +1,4 @@
-/usr/local/sbin/grub-bhyve \
+grub-bhyve \
 --root cd \
 --device-map '<device.map>' \
 --memory 214 \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/cdrom.iso \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
@ -1,4 +1,4 @@
-/usr/local/sbin/grub-bhyve \
+grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
 --memory 214 \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
@ -1,4 +1,4 @@
-/usr/local/sbin/grub-bhyve \
+grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
 --memory 214 \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
@ -1,4 +1,4 @@
-/usr/local/sbin/grub-bhyve \
+grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
 --memory 214 \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -H \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -w \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
@ -1,4 +1,4 @@
-/usr/local/sbin/grub-bhyve \
+grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
 --memory 214 \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
@ -1,4 +1,4 @@
-/usr/local/sbin/grub-bhyve \
+grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
 --memory 214 \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -S \
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
--- a/tests/bhyvexml2argvtest.c
+++ b/tests/bhyvexml2argvtest.c
@ -86,13 +86,13 @@ static int testCompareXMLToArgvFiles(const char *xml,
        goto out;
    }
-    if (!(actualargv = virCommandToString(cmd, true)))
+    if (!(actualargv = virCommandToStringFull(cmd, true, true)))
        goto out;
    if (actualdm != NULL)
        virTrimSpaces(actualdm, NULL);
-    if (!(actualld = virCommandToString(ldcmd, true)))
+    if (!(actualld = virCommandToStringFull(ldcmd, true, true)))
        goto out;
    if (virTestCompareToFileFull(actualargv, cmdline, false) < 0)