External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

bhyvexml2argvtest: use virCommandToStringFull to strip command path

Browse Source 
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>
This commit is contained in:
Pavel Hrdina 2021-04-16 20:32:34 +02:00
parent 7e88184b8e
commit a6cc9e46fb
89 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-A \ -A \

2
tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd1.img \ -d /tmp/freebsd1.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd1.img \ -d /tmp/freebsd1.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd1.img \ -d /tmp/freebsd1.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-base.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/cdrom.iso \ -d /tmp/cdrom.iso \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/cdrom.iso \ -d /tmp/cdrom.iso \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-X \ -X \
-Y \ -Y \
-Z -Z

2
tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-console.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c cpus=2,sockets=1,cores=2,threads=1 \ -c cpus=2,sockets=1,cores=2,threads=1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.ldargs
View File

@ -1,4 +1,4 @@
/fizz_buzz_bazz \ fizz_buzz_bazz \
-X \ -X \
-Y \ -Y \
-Z -Z

2
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
View File

@ -1,4 +1,4 @@
/usr/local/sbin/grub-bhyve \ grub-bhyve \
--root cd \ --root cd \
--device-map '<device.map>' \ --device-map '<device.map>' \
--memory 214 \ --memory 214 \

2
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/cdrom.iso \ -d /tmp/cdrom.iso \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
View File

@ -1,4 +1,4 @@
/usr/local/sbin/grub-bhyve \ grub-bhyve \
--root hd0,msdos1 \ --root hd0,msdos1 \
--device-map '<device.map>' \ --device-map '<device.map>' \
--memory 214 \ --memory 214 \

2
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
View File

@ -1,4 +1,4 @@
/usr/local/sbin/grub-bhyve \ grub-bhyve \
--root hd0,msdos1 \ --root hd0,msdos1 \
--device-map '<device.map>' \ --device-map '<device.map>' \
--memory 214 \ --memory 214 \

2
tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
View File

@ -1,4 +1,4 @@
/usr/local/sbin/grub-bhyve \ grub-bhyve \
--root hd0,msdos1 \ --root hd0,msdos1 \
--device-map '<device.map>' \ --device-map '<device.map>' \
--memory 214 \ --memory 214 \

2
tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-H \ -H \

2
tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-w \ -w \

2
tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
View File

@ -1,4 +1,4 @@
/usr/local/sbin/grub-bhyve \ grub-bhyve \
--root hd0,msdos1 \ --root hd0,msdos1 \
--device-map '<device.map>' \ --device-map '<device.map>' \
--memory 214 \ --memory 214 \

2
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
View File

@ -1,4 +1,4 @@
/usr/local/sbin/grub-bhyve \ grub-bhyve \
--root hd0,msdos1 \ --root hd0,msdos1 \
--device-map '<device.map>' \ --device-map '<device.map>' \
--memory 214 \ --memory 214 \

2
tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

2
tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-u \ -u \

2
tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyve \ bhyve \
-c 1 \ -c 1 \
-m 214 \ -m 214 \
-S \ -S \

2
tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
View File

@ -1,4 +1,4 @@
/usr/sbin/bhyveload \ bhyveload \
-m 214 \ -m 214 \
-d /tmp/freebsd.img \ -d /tmp/freebsd.img \
bhyve bhyve

4
tests/bhyvexml2argvtest.c
View File

@ -86,13 +86,13 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto out; goto out;
} }
if (!(actualargv = virCommandToString(cmd, true))) if (!(actualargv = virCommandToStringFull(cmd, true, true)))
goto out; goto out;
if (actualdm != NULL) if (actualdm != NULL)
virTrimSpaces(actualdm, NULL); virTrimSpaces(actualdm, NULL);
if (!(actualld = virCommandToString(ldcmd, true))) if (!(actualld = virCommandToStringFull(ldcmd, true, true)))
goto out; goto out;
if (virTestCompareToFileFull(actualargv, cmdline, false) < 0) if (virTestCompareToFileFull(actualargv, cmdline, false) < 0)