bhyvexml2argvtest: Use internal wrapping of command line arguments

virCommandToString has the possibility to return an already wrapped
string with better format than what we get from the test wrapper script.

The main advantage is that arguments for an option are always on the
same line which makes it more easy to see what changed in a diff and
prevents re-wrapping of the line if a wrapping point moves over the
threshold.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index bfff8abece56d78b0f161b03a632357b515f671b..d6eb26c5eca94f7533745c4c033a0d806852187b 100644 (file)
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -1713,7 +1713,7 @@ sc_header-ifdef:
        $(PYTHON) $(top_srcdir)/scripts/header-ifdef.py
 
 sc_test-wrap-argv:
-       $(AM_V_GEN)$(VC_LIST) | $(GREP) -v -E 'qemuxml2argvdata|nwfilterxml2firewalldata' \
+       $(AM_V_GEN)$(VC_LIST) | $(GREP) -v -E 'qemuxml2argvdata|nwfilterxml2firewalldata|bhyvexml2argvdata' \
        |$(GREP) -E '\.(ldargs|args)' | $(RUNUTF8) xargs \
        $(PYTHON) $(top_srcdir)/scripts/test-wrap-argv.py --check
 

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
index e71ceec84f3df2d7f554d8842cd5e799ea5fb4cf..001e44147ec08708174a3ec9b0c6e12528de001e 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
@@ -8,4 +8,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:81:c4:b1 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:81:c4:b1 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-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 910d1bbcfaa035033891c47fba753bda66ad95ba..498455275ae671d35c3bf334fd35bb12927bb6ef 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.args
@@ -7,4 +7,5 @@
 -s 0:0,hostbridge \
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+bhyve

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 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-1.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-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 ee833eb4604b86231611894c8b1cada4b9433dd0..70c44932c8ae428e64031adbc422df441cc6245f 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.args
@@ -7,4 +7,5 @@
 -s 0:0,hostbridge \
 -s 31:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+bhyve

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 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-isa-controller-on-slot-31.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-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 d7917bd8f3f685782f94dec964dd93aaea40c3b2..bd987c86aa3b8f5f5eeda5350de619284a1530e4 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.args
@@ -5,17 +5,7 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 2:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd3.img,\
-hd:/tmp/freebsd4.img,hd:/tmp/freebsd5.img,hd:/tmp/freebsd6.img,\
-hd:/tmp/freebsd7.img,hd:/tmp/freebsd8.img,hd:/tmp/freebsd9.img,\
-hd:/tmp/freebsd10.img,hd:/tmp/freebsd11.img,hd:/tmp/freebsd12.img,\
-hd:/tmp/freebsd12.img,hd:/tmp/freebsd13.img,hd:/tmp/freebsd14.img,\
-hd:/tmp/freebsd15.img,hd:/tmp/freebsd16.img,hd:/tmp/freebsd17.img,\
-hd:/tmp/freebsd18.img,hd:/tmp/freebsd19.img,hd:/tmp/freebsd20.img,\
-hd:/tmp/freebsd21.img,hd:/tmp/freebsd22.img,hd:/tmp/freebsd23.img,\
-hd:/tmp/freebsd24.img,hd:/tmp/freebsd25.img,hd:/tmp/freebsd26.img,\
-hd:/tmp/freebsd27.img,hd:/tmp/freebsd28.img,hd:/tmp/freebsd29.img,\
-hd:/tmp/freebsd30.img \
--s 3:0,ahci,hd:/tmp/freebsd31.img,hd:/tmp/freebsd32.img,hd:/tmp/freebsd33.img,\
-hd:/tmp/freebsd34.img,hd:/tmp/freebsd35.img \
--s 4:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
+-s 2:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd3.img,hd:/tmp/freebsd4.img,hd:/tmp/freebsd5.img,hd:/tmp/freebsd6.img,hd:/tmp/freebsd7.img,hd:/tmp/freebsd8.img,hd:/tmp/freebsd9.img,hd:/tmp/freebsd10.img,hd:/tmp/freebsd11.img,hd:/tmp/freebsd12.img,hd:/tmp/freebsd12.img,hd:/tmp/freebsd13.img,hd:/tmp/freebsd14.img,hd:/tmp/freebsd15.img,hd:/tmp/freebsd16.img,hd:/tmp/freebsd17.img,hd:/tmp/freebsd18.img,hd:/tmp/freebsd19.img,hd:/tmp/freebsd20.img,hd:/tmp/freebsd21.img,hd:/tmp/freebsd22.img,hd:/tmp/freebsd23.img,hd:/tmp/freebsd24.img,hd:/tmp/freebsd25.img,hd:/tmp/freebsd26.img,hd:/tmp/freebsd27.img,hd:/tmp/freebsd28.img,hd:/tmp/freebsd29.img,hd:/tmp/freebsd30.img \
+-s 3:0,ahci,hd:/tmp/freebsd31.img,hd:/tmp/freebsd32.img,hd:/tmp/freebsd33.img,hd:/tmp/freebsd34.img,hd:/tmp/freebsd35.img \
+-s 4:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+bhyve

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 70b2224f264732ef7d81eec431edca9e62dd6b6d..ec3f482ca89307a08d3b8c722acb48be07ea910b 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-more-than-32-sata-disks.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd1.img bhyve
+-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 5665842b846cf19c21554eb5ed95fb1d93819ea7..0bd1957e96b9e8c2f17dd09ea6464378557c02eb 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd2.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
index 70b2224f264732ef7d81eec431edca9e62dd6b6d..ec3f482ca89307a08d3b8c722acb48be07ea910b 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-sata-disks.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd1.img bhyve
+-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 8cc1668949cc753cb2871da45068b78ab10d6941..73b1e2ad572991ee2ebe3d59a895ff1c632ca140 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.args
@@ -8,4 +8,5 @@
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:bc:85:fe \
 -s 2:0,virtio-blk,/tmp/freebsd.img \
 -s 4:0,virtio-blk,/tmp/test.img \
--s 5:0,virtio-blk,/tmp/test2.img bhyve
+-s 5:0,virtio-blk,/tmp/test2.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-multiple-virtio-disks.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-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 03bf381ffb2a79a567c9137fc6bf12f210eb11f9..821cc58287c97b24afc4985ee757ca7b1950f2e3 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.args
@@ -8,4 +8,5 @@
 -s 2:0,ahci-hd,/tmp/freebsd1.img \
 -s 3:0,ahci-hd,/tmp/freebsd2.img \
 -s 4:0,ahci-hd,/tmp/freebsd2.img \
--s 5:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
+-s 5:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
index 70b2224f264732ef7d81eec431edca9e62dd6b6d..ec3f482ca89307a08d3b8c722acb48be07ea910b 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-multiple-sata-disks.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd1.img bhyve
+-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 d51924135941b8258bc0ee6fd7a255e6f7101930..9923c4cd85653b1b9657970c8eaabf230a708978 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-no32devs-single-sata-disk.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-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 cbbf768d71aa4499682792e005bbab5fafc70ecb..12859f7d56bb01b876850c6302db45eab7c720de 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-non-isa-controller-on-slot-1.args
@@ -8,4 +8,5 @@
 -l bootrom,/path/to/test.fd \
 -s 2:0,lpc \
 -s 3:0,ahci,hd:/tmp/freebsd.img \
--s 1:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
+-s 1:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
index 547485ba5d66de773f4597051e341706b2eddb62..edcb45a0aed17205220eb897f33d46d3ad682d05 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-sata-disk.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-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 4dcc40404b08c14a3eb076522e0c08a08e8ce83b..3ee96147338be30f2aa06cf1e18906b885f061fd 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:bc:85:fe \
--s 2:0,virtio-blk,/tmp/freebsd.img bhyve
+-s 2:0,virtio-blk,/tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-addr-single-virtio-disk.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
index 547485ba5d66de773f4597051e341706b2eddb62..edcb45a0aed17205220eb897f33d46d3ad682d05 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
index 4d7c7c92a8846cb8de8ef10944ea32a179777a23..f790f746a98efc567367a82714449b8b67aecbaf 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:8d:10:e1 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:8d:10:e1 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
index 24e0bc2bd93e9535860bdee61acf60dc4625f63c..b31d65cd0620ed8f2281b1772f7ba7c1c8d973c5 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/cdrom.iso bhyve
+-d /tmp/cdrom.iso \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
index 8ec9799ccd917e9b41016b8f106579732ace6bf7..e621edbf0ee0665808bcffef2f42e1a44ef210a8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:92:68:0e bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:92:68:0e \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
index f1c0bf3987b0ef215e1f7da41ef10e0f90cd4456..eedc36d35ea33eeb1f72c81d8c5b271879f34dd6 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img,cd:/tmp/cdrom.iso \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:7a:f5:a4 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:7a:f5:a4 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
index 24e0bc2bd93e9535860bdee61acf60dc4625f63c..b31d65cd0620ed8f2281b1772f7ba7c1c8d973c5 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/cdrom.iso bhyve
+-d /tmp/cdrom.iso \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
index 17a1c8380950c454b440125684cf076583f9f1c1..1c5aa009e85605c1215a7f9cf035ed5aa6efa96b 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:11:bd:26 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:11:bd:26 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args b/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
index cb21b99cd680e5181a5ff65c55eceea4189b4a02..153639c3701fabd52bee31413def45ad66d40ebb 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.args
@@ -6,4 +6,7 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 ARGUMENT1 ARGUMENT2 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+ARGUMENT1 \
+ARGUMENT2 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-commandline.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-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 b24918e7eb183f61921220d88ea9e0d45170980a..4d7cb11999089a2669aa082074c422df1bdb26d5 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.args
@@ -8,4 +8,5 @@
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:b1:42:eb \
--l com1,/dev/nmdmdf3be7e7-a104-11e3-aeb0-50e5492bd3dcA bhyve
+-l com1,/dev/nmdmdf3be7e7-a104-11e3-aeb0-50e5492bd3dcA \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console-master-slave-not-specified.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
index 25fbd4727e4648a6cae02645f2672144be5c264c..8c6cb78c9fbff326e19fb3393b79eeb4706bbe7d 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
@@ -8,4 +8,5 @@
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:b1:42:eb \
--l com1,/dev/nmdm0A bhyve
+-l com1,/dev/nmdm0A \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args b/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
index 2d175a4178c959fa9253ceda30309f300d81f376..2c88b650b5002fa7dfdf02b9f441a8392ced933b 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-cputopology.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
index f6bfc783747b42358aeb026b8eed86f49338064e..aca701c3bfcef9be7bb0cd9890e407a93835e838 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:35:99:c2 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:35:99:c2 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
index 72f1d3538cee8bd1a3549ed0c3b683deaab9e197..8f336d7ef2b5f987761ab1506666d694e5d7a986 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,cd:/tmp/cdrom.iso \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:6f:6a:53 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:6f:6a:53 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
index bcf901ef09eaa10b3aa76baf4c5d42e67dfaecc0..85990fc60b0f36df846048d07f8dc40a45b31fb8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.ldargs
@@ -1,4 +1,5 @@
 /usr/local/sbin/grub-bhyve \
 --root cd \
 --device-map '<device.map>' \
---memory 214 bhyve
+--memory 214 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
index 3e61b8fc8a47692094c73a6742c949bd41f83d8d..fd36515efc472d6c44980f6c7e7a88ddaee72be1 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,cd:/tmp/cdrom.iso \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:e3:ec:9b bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:e3:ec:9b \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
index 24e0bc2bd93e9535860bdee61acf60dc4625f63c..b31d65cd0620ed8f2281b1772f7ba7c1c8d973c5 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/cdrom.iso bhyve
+-d /tmp/cdrom.iso \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
index 4dcc40404b08c14a3eb076522e0c08a08e8ce83b..3ee96147338be30f2aa06cf1e18906b885f061fd 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:bc:85:fe \
--s 2:0,virtio-blk,/tmp/freebsd.img bhyve
+-s 2:0,virtio-blk,/tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
index 2f5aa4d7837a4759472ce56da0335efe39320b42..b343469d198a16e48c7d16220ff53a394891cb8b 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-firmware-efi.args
@@ -8,4 +8,5 @@
 -l bootrom,fakefirmwaredir/BHYVE_UEFI.fd \
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
index bfcd88e3664e82396dd106239f9683a03ee8fca6..de986b4eb63feb8773f13d573839b7ca393c2f92 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.args
@@ -7,4 +7,5 @@
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
--s 4:0,virtio-9p,shared_dir=/shared/dir,ro bhyve
+-s 4:0,virtio-9p,shared_dir=/shared/dir,ro \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p-readonly.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
index e890f7400b0cbddf0602a97d95d4d4befb25292e..8943ae211f1ac0f9f97972909080bb0f79a47768 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.args
@@ -7,4 +7,5 @@
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
--s 4:0,virtio-9p,shared_dir=/shared/dir bhyve
+-s 4:0,virtio-9p,shared_dir=/shared/dir \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-fs-9p.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
index e64e67b39d9234d3536e25625255eb431ed6ed55..1c400e1a7c3506ebc83e428e1e940c859c129038 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd3.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:f4:6c:be bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:f4:6c:be \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
index 7d9a5155a1412d71be696fd012b97e90c73e33c2..9a50cf653788a859c150774e1504dbe38bf208d9 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.ldargs
@@ -1,4 +1,5 @@
 /usr/local/sbin/grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
---memory 214 bhyve
+--memory 214 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
index 872a69df3ba1e2c66db285c7654c14ba4df060aa..a09338d004a40aa76f465bd42452649d0efe92b0 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd1.img,hd:/tmp/freebsd2.img,hd:/tmp/freebsd3.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:0e:d2:6f bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:0e:d2:6f \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
index 7d9a5155a1412d71be696fd012b97e90c73e33c2..9a50cf653788a859c150774e1504dbe38bf208d9 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.ldargs
@@ -1,4 +1,5 @@
 /usr/local/sbin/grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
---memory 214 bhyve
+--memory 214 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
index 3ba5c116089677d735e65974ce74e1761a8566bb..91c06e3e3a66f1bd8dfc50eee8cd0394267be092 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:ee:f5:79 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:ee:f5:79 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
index 7d9a5155a1412d71be696fd012b97e90c73e33c2..9a50cf653788a859c150774e1504dbe38bf208d9 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.ldargs
@@ -1,4 +1,5 @@
 /usr/local/sbin/grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
---memory 214 bhyve
+--memory 214 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args b/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
index b1c0c94d030f571a22a1e2d3502beb8ceadc7173..dfe1334edd9dfc2d106830558b410670433d4c1b 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,xhci,tablet \
--s 3:0,ahci-hd,/tmp/freebsd.img bhyve
+-s 3:0,ahci-hd,/tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-input-xhci-tablet.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
index 910d1bbcfaa035033891c47fba753bda66ad95ba..498455275ae671d35c3bf334fd35bb12927bb6ef 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.args
@@ -7,4 +7,5 @@
 -s 0:0,hostbridge \
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-isa-controller.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
index 307d888c1f2d385f3a2fa16e0223d8a7c27b70b0..e4f66080b9bab92784230d39e64571d1148ef6d9 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
@@ -5,4 +5,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:82:ca:a3 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:82:ca:a3 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
index 5e13a9742d3b1a22f7d826c6f748d23f365ca348..c17f216cb651f4f0a09a055c17545fcbcc8e1b17 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:22:ee:11 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:22:ee:11 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-macaddr.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args b/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
index dbe377421b173a59570d41543a20036d75d87ffe..4b0e28ba41b1e08f619624ff166fc8deb2a5fc7b 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.args
@@ -7,4 +7,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-msrs.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
index 09e30db46e401fe4bfa992991d34ae2f42992952..f6f45bdf431cffcd031447dfdec949c67d1f549c 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.args
@@ -6,4 +6,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,e1000,faketapdev,mac=52:54:00:00:00:00 bhyve
+-s 3:0,e1000,faketapdev,mac=52:54:00:00:00:00 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-net-e1000.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
index 02846cb893a2ce4d34914b22282b7c453364cb2d..050452cfa29a66e9a747e6e6a56c22aa52b82a8f 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
@@ -8,4 +8,5 @@
 -s 1:0,lpc \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:a7:cd:5b \
--l com1,/dev/nmdm0A bhyve
+-l com1,/dev/nmdm0A \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
index 7d9a5155a1412d71be696fd012b97e90c73e33c2..9a50cf653788a859c150774e1504dbe38bf208d9 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.ldargs
@@ -1,4 +1,5 @@
 /usr/local/sbin/grub-bhyve \
 --root hd0,msdos1 \
 --device-map '<device.map>' \
---memory 214 bhyve
+--memory 214 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
index e4712b448c325a86e9d614608de7375536b85fb9..f51fa0834c129984b5455907992377908ec4ab58 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
@@ -8,4 +8,5 @@
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:f0:72:11 \
--l com1,/dev/nmdm0A bhyve
+-l com1,/dev/nmdm0A \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
index 1ee7fd4cdf48de61476abd991354357bbaeb7401..10f8d92e6c9642fbc1c6b42673a3be64175fc62e 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.ldargs
@@ -2,4 +2,5 @@
 --root hd0,msdos1 \
 --device-map '<device.map>' \
 --memory 214 \
---cons-dev /dev/nmdm0A bhyve
+--cons-dev /dev/nmdm0A \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
index f45a19013794ac5aa26b07a329f76d8850556e1d..df12646a889b80cd4f138aa8335ed1bb30997183 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
@@ -8,4 +8,5 @@
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:4f:f3:5b \
--l com1,/dev/nmdm0A bhyve
+-l com1,/dev/nmdm0A \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.args b/tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
index 05ff4965dd132dfa52121a4d1b5156d4fe724b23..8a99690ae5c40674fa8c7c0bff8b0ec994903be7 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-sound.args
@@ -7,4 +7,5 @@
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
--s 4:0,hda,play=/dev/dsp0,rec=/dev/dsp0 bhyve
+-s 4:0,hda,play=/dev/dsp0,rec=/dev/dsp0 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-sound.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
index 937b066e8c5e438bd766059d1ee2601f2c534c88..22a21065dbd7d7cbe64d3c38aa72794794aad568 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-uefi.args
@@ -8,4 +8,5 @@
 -l bootrom,/path/to/test.fd \
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
index 551469dabece862e462c6ecc08f8456e518c95a4..8b692c187768da1656310bff099efecdc52de6d5 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-autoport.args
@@ -9,4 +9,5 @@
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
--s 4:0,fbuf,tcp=127.0.0.1:5900 bhyve
+-s 4:0,fbuf,tcp=127.0.0.1:5900 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
index b3b1c244be6dca6a63b6dfae05a2277b3c04bea5..682b03b2e02d9a36ef4988ec36f7e452bd07f165 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-password.args
@@ -9,4 +9,5 @@
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
--s 4:0,fbuf,tcp=127.0.0.1:5904,password=s3cr3t bhyve
+-s 4:0,fbuf,tcp=127.0.0.1:5904,password=s3cr3t \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
index 5e54da6ed78b57d189a71cf827dfbae44348ed00..4b4d62a68c9d0926935b7a0d6e5f130bf0b7fed3 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-resolution.args
@@ -7,4 +7,5 @@
 -s 0:0,hostbridge \
 -l bootrom,/path/to/test.fd \
 -s 1:0,lpc \
--s 2:0,fbuf,tcp=127.0.0.1:5904,w=1920,h=1080 bhyve
+-s 2:0,fbuf,tcp=127.0.0.1:5904,w=1920,h=1080 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
index 47022e84cf7b433ba65eac5df81185ebecc25707..960b2dfe5eb5952578e4b9cc87458dfbc3db6153 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-io.args
@@ -9,4 +9,5 @@
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
--s 4:0,fbuf,tcp=127.0.0.1:5904,vga=io bhyve
+-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=io \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
index 923098f3db2fd13ce5762830c26b3d595ebdfbfc..0639161ad0420a819cb9bd72b89d7813c417ce4a 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-off.args
@@ -9,4 +9,5 @@
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
--s 4:0,fbuf,tcp=127.0.0.1:5904,vga=off bhyve
+-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=off \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
index 9225f5d1334802689647a14b87aaee5761db3992..caa9b0e9a6395caac3c7d8d8c96de10eb199c67d 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc-vgaconf-on.args
@@ -9,4 +9,5 @@
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
--s 4:0,fbuf,tcp=127.0.0.1:5904,vga=on bhyve
+-s 4:0,fbuf,tcp=127.0.0.1:5904,vga=on \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
index cd7a543265e8fd678d0d224c5a148b32b2ff96d3..0301aa666ec19794f3427720490aade24417aed2 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-vnc.args
@@ -9,4 +9,5 @@
 -s 1:0,lpc \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
 -s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
--s 4:0,fbuf,tcp=127.0.0.1:5904 bhyve
+-s 4:0,fbuf,tcp=127.0.0.1:5904 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
index 13d4f490955801ddb3ad93e8017591489126dc4b..f2c415ece5dc51bb10fd5192180a99beb9eed89e 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.args
@@ -7,4 +7,5 @@
 -P \
 -s 0:0,hostbridge \
 -s 2:0,ahci,hd:/tmp/freebsd.img \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 bhyve
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
+bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
index 32538b558ef3174217a36f1890713552e64ce9be..91f9658137a9059182718fc789acc5d5fc388ed8 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-wired.ldargs
@@ -1,3 +1,4 @@
 /usr/sbin/bhyveload \
 -m 214 \
--d /tmp/freebsd.img bhyve
+-d /tmp/freebsd.img \
+bhyve

diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c
index 34e40a64389df61004ec607119e45de5aec85c9d..c4fe4ef17a2d2a7aa20a3e5002e96166f8304751 100644 (file)
--- a/tests/bhyvexml2argvtest.c
+++ b/tests/bhyvexml2argvtest.c
@@ -86,19 +86,19 @@ static int testCompareXMLToArgvFiles(const char *xml,
         goto out;
     }
 
-    if (!(actualargv = virCommandToString(cmd, false)))
+    if (!(actualargv = virCommandToString(cmd, true)))
         goto out;
 
     if (actualdm != NULL)
         virTrimSpaces(actualdm, NULL);
 
-    if (!(actualld = virCommandToString(ldcmd, false)))
+    if (!(actualld = virCommandToString(ldcmd, true)))
         goto out;
 
-    if (virTestCompareToFile(actualargv, cmdline) < 0)
+    if (virTestCompareToFileFull(actualargv, cmdline, false) < 0)
         goto out;
 
-    if (virTestCompareToFile(actualld, ldcmdline) < 0)
+    if (virTestCompareToFileFull(actualld, ldcmdline, false) < 0)
         goto out;
 
     if (virFileExists(dmcmdline) || actualdm) {