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

tests: move xml2sexpr tests to WITH_LIBXL

Browse Source 
In preparation of removing the legacy Xen driver, move the
xml2sexpr tests from WITH_XEN to WITH_LIBXL. Even though the
legacy driver will be removed, we'll want to maintain the ability
to convert sexpr <-> XML.

There is some test file fallout due to differences in handling
of default values between xend and libxl.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Jim Fehlig 2016-12-27 15:27:08 -07:00
parent 6f2c56d918
commit 2ea9d403ff
27 changed files with 37 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/Makefile.am
View File

@ -273,12 +273,12 @@ ssh_SOURCES = ssh.c
ssh_LDADD = $(COVERAGE_LDFLAGS)
if WITH_XEN
test_programs += xml2sexprtest sexpr2xmltest \
test_programs += sexpr2xmltest \
xmconfigtest xencapstest
endif WITH_XEN
if WITH_LIBXL
test_programs += xlconfigtest libxlxml2domconfigtest
test_programs += xlconfigtest xml2sexprtest libxlxml2domconfigtest
test_libraries += virmocklibxl.la
endif WITH_LIBXL
@ -502,11 +502,6 @@ if WITH_XEN
xen_LDADDS = ../src/libvirt_driver_xen_impl.la
xen_LDADDS += $(LDADDS)
xml2sexprtest_SOURCES = \
xml2sexprtest.c testutilsxen.c testutilsxen.h \
testutils.c testutils.h
xml2sexprtest_LDADD = $(xen_LDADDS)
sexpr2xmltest_SOURCES = \
sexpr2xmltest.c testutilsxen.c testutilsxen.h \
testutils.c testutils.h
@ -522,7 +517,7 @@ xencapstest_SOURCES = \
xencapstest_LDADD = $(xen_LDADDS)
else ! WITH_XEN
EXTRA_DIST += xml2sexprtest.c sexpr2xmltest.c xmconfigtest.c \
EXTRA_DIST += sexpr2xmltest.c xmconfigtest.c \
xencapstest.c \
testutilsxen.c testutilsxen.h
endif ! WITH_XEN
@ -539,6 +534,11 @@ xlconfigtest_SOURCES = \
testutils.c testutils.h
xlconfigtest_LDADD =$(libxl_LDADDS)
xml2sexprtest_SOURCES = \
xml2sexprtest.c testutilsxen.c testutilsxen.h \
testutils.c testutils.h
xml2sexprtest_LDADD = $(libxl_LDADDS)
libxlxml2domconfigtest_SOURCES = \
libxlxml2domconfigtest.c testutilsxen.c testutilsxen.h \
testutils.c testutils.h
@ -550,7 +550,7 @@ virmocklibxl_la_LDFLAGS = $(MOCKLIBS_LDFLAGS)
virmocklibxl_la_LIBADD = $(MOCKLIBS_LIBS)
else ! WITH_LIBXL
EXTRA_DIST += xlconfigtest.c libxlxml2domconfigtest.c
EXTRA_DIST += xlconfigtest.c xml2sexprtest.c libxlxml2domconfigtest.c
endif ! WITH_LIBXL
QEMUMONITORTESTUTILS_SOURCES = \

2
tests/xml2sexprdata/xml2sexpr-escape.sexpr
View File

@ -5,7 +5,7 @@
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os&version="devel" ')\
(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(usb 1)(parallel none)\
(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)(boot c)(pae 1)(usb 1)(parallel none)\
(serial pty)(device_model '/usr/lib/xen/bin/qemu-dm')(rtc_timeoffset 0)\
(localtime 0)))(localtime 0)\
(device (vbd (dev 'xvda:disk')(uname 'file:/root/\'\\some.img')(mode 'w'))))

2
tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)(serial none)\
(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 1)(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)(serial none)\
(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(hpet 0)(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr
View File

@ -5,7 +5,7 @@
(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')\
(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/\
core/test/5.91/x86_64/os ')(loader '/usr/lib/xen/boot/hvmloader')(vcpus 2)\
(boot c)(usb 1)(parallel none)(serial pty)\
(boot c)(pae 1)(usb 1)(parallel none)(serial pty)\
(device_model '/usr/lib/xen/bin/qemu-dm')\
(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)(serial none)\
(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 1)))\
(localtime 1)\

2
tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr
View File

@ -1,7 +1,7 @@
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae 1)\
(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr
View File

@ -1,7 +1,7 @@
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae 1)\
(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel tcp:localhost:9999)\
(acpi 1)(pae 1)(usb 1)(parallel tcp:localhost:9999)\
(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)\
(acpi 1)(pae 1)(usb 1)(parallel none)\
(serial (/dev/ttyS0 /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')\
(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

2
tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)\
(acpi 1)(pae 1)(usb 1)(parallel none)\
(serial (none /dev/ttyS1))(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)\
(acpi 1)(pae 1)(usb 1)(parallel none)\
(serial file:/tmp/serial.log)(device_model '/usr/lib64/xen/bin/qemu-dm')\
(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

2
tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)(serial null)\
(acpi 1)(pae 1)(usb 1)(parallel none)(serial null)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)\
(acpi 1)(pae 1)(usb 1)(parallel none)\
(serial pipe:/tmp/serial.pipe)(device_model '/usr/lib64/xen/bin/qemu-dm')\
(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

2
tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)(serial pty)\
(acpi 1)(pae 1)(usb 1)(parallel none)(serial pty)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)(serial stdio)\
(acpi 1)(pae 1)(usb 1)(parallel none)(serial stdio)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)\
(acpi 1)(pae 1)(usb 1)(parallel none)\
(serial telnet:localhost:9999,server,nowait)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

2
tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)\
(acpi 1)(pae 1)(usb 1)(parallel none)\
(serial tcp:localhost:9999,server,nowait)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

2
tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)\
(acpi 1)(pae 1)(usb 1)(parallel none)\
(serial udp:localhost:9998@localhost:9999)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

2
tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)\
(acpi 1)(pae 1)(usb 1)(parallel none)\
(serial unix:/tmp/serial.sock,server,nowait)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\

2
tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)(serial none)\
(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
(soundhw 'sb16,es1370')(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(usbdevice mouse)(parallel none)\
(acpi 1)(pae 1)(usb 1)(usbdevice mouse)(parallel none)\
(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)(serial none)\
(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr
View File

@ -1,7 +1,7 @@
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae 1)\
(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
(vnc 1)(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

2
tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr
View File

@ -1,7 +1,7 @@
(vm (name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)(acpi 1)(pae 1)\
(usb 1)(parallel none)(serial none)(device_model '/usr/lib64/xen/bin/qemu-dm')\
(vnc 1)(vncunused 1)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)(device (vbd (dev 'hda:disk')\

2
tests/xml2sexprdata/xml2sexpr-fv.sexpr
View File

@ -2,7 +2,7 @@
(uuid 'b5d70dd2-75cd-aca5-1776-9660b059d8bc')(on_poweroff 'destroy')\
(on_reboot 'restart')(on_crash 'restart')\
(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')(vcpus 1)(boot c)\
(acpi 1)(usb 1)(parallel none)(serial none)\
(acpi 1)(pae 1)(usb 1)(parallel none)(serial none)\
(device_model '/usr/lib64/xen/bin/qemu-dm')(vnc 1)\
(vncunused 0)(vncdisplay 17)(keymap 'ja')(rtc_timeoffset 0)(localtime 0)))\
(localtime 0)\

7
tests/xml2sexprtest.c
View File

@ -8,12 +8,11 @@
#include <unistd.h>
#include "internal.h"
#include "xen/xend_internal.h"
#include "xen/xen_driver.h"
#include "xenconfig/xen_sxpr.h"
#include "testutils.h"
#include "testutilsxen.h"
#include "virstring.h"
#include "libxl/libxl_conf.h"
#define VIR_FROM_THIS VIR_FROM_NONE
@ -95,10 +94,10 @@ mymain(void)
ret = -1; \
} while (0)
if (!(caps = testXenCapsInit()))
if (!(caps = testXLInitCaps()))
return EXIT_FAILURE;
if (!(xmlopt = xenDomainXMLConfInit()))
if (!(xmlopt = libxlCreateXMLConf()))
return EXIT_FAILURE;
DO_TEST("pv", "pv", "pvtest");