On Mon, Apr 19, 2021 at 07:14:15PM +0200, Pavel Hrdina wrote: > 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@xxxxxxxxxx> > --- > 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(-) Reviewed-by: Daniel P. Berrangé <berrange@xxxxxxxxxx> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|