From: Andrea Bolognani Date: Thu, 28 Feb 2019 16:25:18 +0000 (+0100) Subject: tests: Add -inactive suffix when appropriate for qemuxml2xml X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=09a95068fba0650fe161fc4e5cd1bfdca8620bf7;p=libvirt.git tests: Add -inactive suffix when appropriate for qemuxml2xml Some test cases are only executed using WHEN_INACTIVE, and the output file name should reflect this for clarity. Signed-off-by: Andrea Bolognani Reviewed-by: Ján Tomko --- diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml new file mode 100644 index 0000000000..7163015192 --- /dev/null +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml @@ -0,0 +1,39 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-i686 + + + + +
+ + +
+ + +
+ + + + + +
+ + + + system_u:system_r:svirt_custom_t:s0 + + diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml deleted file mode 100644 index 7163015192..0000000000 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel.xml +++ /dev/null @@ -1,39 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - -
- - -
- - - - - -
- - - - system_u:system_r:svirt_custom_t:s0 - - diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml new file mode 100644 index 0000000000..7163015192 --- /dev/null +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml @@ -0,0 +1,39 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219100 + 219100 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-i686 + + + + +
+ + +
+ + +
+ + + + + +
+ + + + system_u:system_r:svirt_custom_t:s0 + + diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml deleted file mode 100644 index 7163015192..0000000000 --- a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip.xml +++ /dev/null @@ -1,39 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 219100 - 1 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-i686 - - - - -
- - -
- - -
- - - - - -
- - - - system_u:system_r:svirt_custom_t:s0 - - diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml new file mode 100644 index 0000000000..bfa66b8deb --- /dev/null +++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml @@ -0,0 +1,53 @@ + + migt10 + 0d73c5c3-43d0-f75b-31de-6aa919b0176b + 262144 + 262144 + + + + + + 4 + + hvm + + + + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + +
+ + +
+ + + +
+ + + +
+ + + + + + +