[libvirt PATCH 12/17] bhyvexml2argvtest: use virCommandToStringFull to strip command path

Fri Apr 16 19:12:41 UTC 2021

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 at redhat.com>
---
 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args           | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs         | 2 +-
 .../bhyvexml2argv-addr-isa-controller-on-slot-1.args          | 2 +-
 .../bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs        | 2 +-
 .../bhyvexml2argv-addr-isa-controller-on-slot-31.args         | 2 +-
 .../bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs       | 2 +-
 .../bhyvexml2argv-addr-more-than-32-sata-disks.args           | 2 +-
 .../bhyvexml2argv-addr-more-than-32-sata-disks.ldargs         | 2 +-
 .../bhyvexml2argv-addr-multiple-sata-disks.args               | 2 +-
 .../bhyvexml2argv-addr-multiple-sata-disks.ldargs             | 2 +-
 .../bhyvexml2argv-addr-multiple-virtio-disks.args             | 2 +-
 .../bhyvexml2argv-addr-multiple-virtio-disks.ldargs           | 2 +-
 .../bhyvexml2argv-addr-no32devs-multiple-sata-disks.args      | 2 +-
 .../bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs    | 2 +-
 .../bhyvexml2argv-addr-no32devs-single-sata-disk.args         | 2 +-
 .../bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs       | 2 +-
 .../bhyvexml2argv-addr-non-isa-controller-on-slot-1.args      | 2 +-
 .../bhyvexml2argv-addr-single-sata-disk.args                  | 2 +-
 .../bhyvexml2argv-addr-single-sata-disk.ldargs                | 2 +-
 .../bhyvexml2argv-addr-single-virtio-disk.args                | 2 +-
 .../bhyvexml2argv-addr-single-virtio-disk.ldargs              | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-base.args               | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs             | 2 +-
 .../bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args  | 2 +-
 .../bhyvexml2argv-bhyveload-bootorder.ldargs                  | 2 +-
 .../bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args | 2 +-
 .../bhyvexml2argv-bhyveload-bootorder1.ldargs                 | 2 +-
 .../bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args | 2 +-
 .../bhyvexml2argv-bhyveload-bootorder3.ldargs                 | 2 +-
 .../bhyvexml2argv-bhyveload-explicitargs.args                 | 2 +-
 .../bhyvexml2argv-bhyveload-explicitargs.ldargs               | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args        | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs      | 2 +-
 .../bhyvexml2argv-console-master-slave-not-specified.args     | 2 +-
 .../bhyvexml2argv-console-master-slave-not-specified.ldargs   | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-console.args            | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs          | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args        | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs      | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args      | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs    | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args    | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs  | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args         | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs       | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args        | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs      | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args       | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args     | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs   | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args              | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs            | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args     | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs   | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args    | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs  | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args      | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs    | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args  | 2 +-
 .../bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs  | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args     | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs   | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args          | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs        | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args            | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs          | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args               | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs             | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args          | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs        | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args | 2 +-
 .../bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args        | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs      | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-serial.args             | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs           | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-sound.args              | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs            | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args               | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args       | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args       | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args     | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args     | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args    | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args     | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args                | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-wired.args              | 2 +-
 tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs            | 2 +-
 tests/bhyvexml2argvtest.c                                     | 4 ++--
 89 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
index 001e44147e..146e3c6eee 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args
index 498455275a..735a084ac7 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args
index 70c44932c8..0846afafd0 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args
index bd987c86aa..51434ed1df 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
index ec3f482ca8..4257ffccee 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args
index 0bd1957e96..976d800f47 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
index ec3f482ca8..4257ffccee 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args
index 73b1e2ad57..47b9ca094f 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
index 821cc58287..2bb2689c79 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
index ec3f482ca8..4257ffccee 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args
index 9923c4cd85..153a1d5035 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
index 12859f7d56..8517c0d06a 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
index edcb45a0ae..507e0be668 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args
index 3ee9614733..9c00e02000 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
index edcb45a0ae..507e0be668 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
index f790f746a9..a6df2a673e 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
index b31d65cd06..25cfbc4cc3 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
index e621edbf0e..f10304cc9f 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
index eedc36d35e..96e05c6c9c 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
index b31d65cd06..25cfbc4cc3 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
index 1c5aa009e8..514ec78c82 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs
index 73871acad0..265475b7dc 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args b/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
index 153639c370..cfbc57bd8c 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args
index 4d7cb11999..5d0c5c2987 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
index 8c6cb78c9f..712dee9a2b 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args b/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
index 2c88b650b5..d7a232fcb1 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
index aca701c3bf..a8570b3ca2 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs
index 359ad90a2c..ca4bbaa987 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
index 8f336d7ef2..f54ebbc8b3 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
index 85990fc60b..627a07bdfd 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
index fd36515efc..ba6ddeffbe 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
index b31d65cd06..25cfbc4cc3 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
index 3ee9614733..9c00e02000 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
index b343469d19..c87dc7d779 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
index de986b4eb6..c321d4d76d 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
index 8943ae211f..0f02d5be4e 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
index 1c400e1a7c..9ed28162ac 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
index 9a50cf6537..56e2f27cfc 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
index a09338d004..7ed87b2578 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
index 9a50cf6537..56e2f27cfc 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
index 91c06e3e3a..5a6ae06256 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
index 9a50cf6537..56e2f27cfc 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args b/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
index dfe1334edd..cb64d19aff 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
index 498455275a..735a084ac7 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
index e4f66080b9..c06ffceba1 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
index c17f216cb6..1c737b66e7 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args b/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
index 4b0e28ba41..60e5a60db2 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
index f6f45bdf43..370929a232 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
index 050452cfa2..f9ec58793d 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
index 9a50cf6537..56e2f27cfc 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
index f51fa0834c..330f791b85 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
index 10f8d92e6c..c9d59cb0b8 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
index df12646a88..06ba1ae513 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.args b/tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
index 8a99690ae5..cb61b89ee5 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
index 22a21065db..479712967d 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
index 8b692c1877..3991f9fc16 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
index 682b03b2e0..dfd3b0a285 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
index 4b4d62a68c..52cae37f76 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
index 960b2dfe5e..80e2bd7223 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
index 0639161ad0..1975fdc4d7 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
index caa9b0e9a6..e62dfff239 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
index 0301aa666e..049e65227d 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
index f2c415ece5..b6b0a18529 100644
--- 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 \
diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
index 91f9658137..5905f4b3e6 100644
--- 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
diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c
index c4fe4ef17a..cdaa32f65c 100644
--- 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)
-- 
2.30.2


