]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
bhyvexml2argvtest: use virCommandToStringFull to strip command path
authorPavel Hrdina <phrdina@redhat.com>
Fri, 16 Apr 2021 18:32:34 +0000 (20:32 +0200)
committerPavel Hrdina <phrdina@redhat.com>
Wed, 21 Apr 2021 12:20:03 +0000 (14:20 +0200)
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>
89 files changed:
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args
tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args
tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-base.args
tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args
tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-console.args
tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
tests/bhyvexml2argvtest.c

index 001e44147ec08708174a3ec9b0c6e12528de001e..146e3c6eee601d061fc39824387ebf74ec79b7db 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -A \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index 498455275ae671d35c3bf334fd35bb12927bb6ef..735a084ac731314391e7af2b8eca4a90b28bd440 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index bd987c86aa3b8f5f5eeda5350de619284a1530e4..51434ed1df1aa4d4b14a2b7c79d65a8d7dddead2 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index ec3f482ca89307a08d3b8c722acb48be07ea910b..4257ffccee332c068d86f4fdb99b2b191c6a692d 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd1.img \
 bhyve
index 0bd1957e96b9e8c2f17dd09ea6464378557c02eb..976d800f47cd46ce93f2023a047e1e5ca8a685a2 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index ec3f482ca89307a08d3b8c722acb48be07ea910b..4257ffccee332c068d86f4fdb99b2b191c6a692d 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd1.img \
 bhyve
index 73b1e2ad572991ee2ebe3d59a895ff1c632ca140..47b9ca094f1e6afd57492e104e0678f7564d9915 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index ec3f482ca89307a08d3b8c722acb48be07ea910b..4257ffccee332c068d86f4fdb99b2b191c6a692d 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd1.img \
 bhyve
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index edcb45a0aed17205220eb897f33d46d3ad682d05..507e0be6681eb30efa316e5eb9adf6fae1ed833f 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index 3ee96147338be30f2aa06cf1e18906b885f061fd..9c00e0200033045863c585c14c6deed418f413e1 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index edcb45a0aed17205220eb897f33d46d3ad682d05..507e0be6681eb30efa316e5eb9adf6fae1ed833f 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index f790f746a98efc567367a82714449b8b67aecbaf..a6df2a673ed6f8779d74631d2569de1cafce2850 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index b31d65cd0620ed8f2281b1772f7ba7c1c8d973c5..25cfbc4cc38fa465a14e21c196aa36b3476de73b 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/cdrom.iso \
 bhyve
index e621edbf0ee0665808bcffef2f42e1a44ef210a8..f10304cc9f948dd82a8aef190b6e1e4576c04e7a 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index eedc36d35ea33eeb1f72c81d8c5b271879f34dd6..96e05c6c9cec5239d57d8ee1cbff612518f3ba09 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index b31d65cd0620ed8f2281b1772f7ba7c1c8d973c5..25cfbc4cc38fa465a14e21c196aa36b3476de73b 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/cdrom.iso \
 bhyve
index 1c5aa009e85605c1215a7f9cf035ed5aa6efa96b..514ec78c82fc145722cf391005a839118fa29d0e 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 73871acad0d8ab6db550bd2621858fb2a3b14c9a..265475b7dcfad5338dd7de3b75ddbf45318aa945 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -X \
 -Y \
 -Z
index 153639c3701fabd52bee31413def45ad66d40ebb..cfbc57bd8c9444b56c8430f416b1bb7ec55c4017 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index 8c6cb78c9fbff326e19fb3393b79eeb4706bbe7d..712dee9a2b839149b139a5823fb2e920175f84db 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index 2c88b650b5002fa7dfdf02b9f441a8392ced933b..d7a232fcb17e4440b5419080105a535d6a786210 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c cpus=2,sockets=1,cores=2,threads=1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index aca701c3bfcef9be7bb0cd9890e407a93835e838..a8570b3ca2ac8915b696c376e476da1a7cdf01c7 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 359ad90a2c062532bc679cf21f027a653bb4c9ed..ca4bbaa987d872620a54283b61491001d4ec564d 100644 (file)
@@ -1,4 +1,4 @@
-/fizz_buzz_bazz \
+fizz_buzz_bazz \
 -X \
 -Y \
 -Z
index 8f336d7ef2b5f987761ab1506666d694e5d7a986..f54ebbc8b38d5b6e4ee324de2fa418683154cd5f 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 85990fc60b0f36df846048d07f8dc40a45b31fb8..627a07bdfd8a84ef2edb2c7d0c2ddff6423a6576 100644 (file)
@@ -1,4 +1,4 @@
-/usr/local/sbin/grub-bhyve \
+grub-bhyve \
 --root cd \
 --device-map '<device.map>' \
 --memory 214 \
index fd36515efc472d6c44980f6c7e7a88ddaee72be1..ba6ddeffbeb8433d5741bcfcdc52a7ec7d069fd9 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index b31d65cd0620ed8f2281b1772f7ba7c1c8d973c5..25cfbc4cc38fa465a14e21c196aa36b3476de73b 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/cdrom.iso \
 bhyve
index 3ee96147338be30f2aa06cf1e18906b885f061fd..9c00e0200033045863c585c14c6deed418f413e1 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index b343469d198a16e48c7d16220ff53a394891cb8b..c87dc7d77946b4cbbd549a3c82757e55c26f80a1 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index de986b4eb63feb8773f13d573839b7ca393c2f92..c321d4d76d602e29606768c2a86c62b34c3b8188 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index 8943ae211f1ac0f9f97972909080bb0f79a47768..0f02d5be4e4700f5e03fd09b74cbf023de694cfc 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index 1c400e1a7c3506ebc83e428e1e940c859c129038..9ed28162ac16074d8bcf559888e29d6b4173fc86 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 9a50cf653788a859c150774e1504dbe38bf208d9..56e2f27cfc0428accbc102cb42e7e4312c886869 100644 (file)
@@ -1,4 +1,4 @@
-/usr/local/sbin/grub-bhyve \
+grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
 --memory 214 \
index a09338d004a40aa76f465bd42452649d0efe92b0..7ed87b25781bc752ca3497883432730372a9b70c 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 9a50cf653788a859c150774e1504dbe38bf208d9..56e2f27cfc0428accbc102cb42e7e4312c886869 100644 (file)
@@ -1,4 +1,4 @@
-/usr/local/sbin/grub-bhyve \
+grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
 --memory 214 \
index 91c06e3e3a66f1bd8dfc50eee8cd0394267be092..5a6ae062568b6bcb7c56dc20b3741a3066c0bc7a 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 9a50cf653788a859c150774e1504dbe38bf208d9..56e2f27cfc0428accbc102cb42e7e4312c886869 100644 (file)
@@ -1,4 +1,4 @@
-/usr/local/sbin/grub-bhyve \
+grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
 --memory 214 \
index dfe1334edd9dfc2d106830558b410670433d4c1b..cb64d19aff6d0edc30463781370fca1ebd7e9141 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index 498455275ae671d35c3bf334fd35bb12927bb6ef..735a084ac731314391e7af2b8eca4a90b28bd440 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index e4f66080b9bab92784230d39e64571d1148ef6d9..c06ffceba1e76f5da6e5eb84a196ce55f2a9559c 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -H \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index c17f216cb651f4f0a09a055c17545fcbcc8e1b17..1c737b66e792f3cd15cd3e058b17a5bf67c33fb6 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index 4b0e28ba41b1e08f619624ff166fc8deb2a5fc7b..60e5a60db2139967ca04d5c869bd80478ded3833 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -w \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index f6f45bdf431cffcd031447dfdec949c67d1f549c..370929a2323e5de386236cfabdffe1a06831540b 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index 050452cfa29a66e9a747e6e6a56c22aa52b82a8f..f9ec58793dbbb6b307ee1609d1a1142525b12e85 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 9a50cf653788a859c150774e1504dbe38bf208d9..56e2f27cfc0428accbc102cb42e7e4312c886869 100644 (file)
@@ -1,4 +1,4 @@
-/usr/local/sbin/grub-bhyve \
+grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
 --memory 214 \
index f51fa0834c129984b5455907992377908ec4ab58..330f791b850fabf4b1e876abb8e437779477e229 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 10f8d92e6c9642fbc1c6b42673a3be64175fc62e..c9d59cb0b861da8c8c63ba166081625153463f9d 100644 (file)
@@ -1,4 +1,4 @@
-/usr/local/sbin/grub-bhyve \
+grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
 --memory 214 \
index df12646a889b80cd4f138aa8335ed1bb30997183..06ba1ae5137f821d3efd3a36e3e83bbfa056b581 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index 8a99690ae5c40674fa8c7c0bff8b0ec994903be7..cb61b89ee5f25751749391a7af864504fe8a5678 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index 22a21065dbd7d7cbe64d3c38aa72794794aad568..479712967da800bddaf0550600c33d2808139eb6 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 8b692c187768da1656310bff099efecdc52de6d5..3991f9fc16c7aa087205b7cb330ca23cd98429fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 682b03b2e02d9a36ef4988ec36f7e452bd07f165..dfd3b0a2850c7e1dea807d30d34aed9a50673a76 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 4b4d62a68c9d0926935b7a0d6e5f130bf0b7fed3..52cae37f7621d4ab0831fe5c0527c2fd40ebcb36 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 960b2dfe5eb5952578e4b9cc87458dfbc3db6153..80e2bd7223a3af0ee9ab1390bf4e51a7f3f15490 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 0639161ad0420a819cb9bd72b89d7813c417ce4a..1975fdc4d7b46bf04339e42a9d1cd0547948cc84 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index caa9b0e9a6395caac3c7d8d8c96de10eb199c67d..e62dfff23939c3e8451bd210a35c298bd55581c3 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index 0301aa666ec19794f3427720490aade24417aed2..049e65227d87e23d11dfb641ba61c98a4299df9d 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -u \
index f2c415ece5dc51bb10fd5192180a99beb9eed89e..b6b0a18529d94ac956869bfb443f3265bd8936a2 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyve \
+bhyve \
 -c 1 \
 -m 214 \
 -S \
index 91f9658137a9059182718fc789acc5d5fc388ed8..5905f4b3e6c31af3da8b53e4c43bca05633691fb 100644 (file)
@@ -1,4 +1,4 @@
-/usr/sbin/bhyveload \
+bhyveload \
 -m 214 \
 -d /tmp/freebsd.img \
 bhyve
index c4fe4ef17a2d2a7aa20a3e5002e96166f8304751..cdaa32f65c3fabe7b26263879fbd845f80982c8b 100644 (file)
@@ -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)