From d0924f8c808013da1da01b214dcac681538c1163 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 3 Jul 2019 08:36:09 +0200 Subject: [PATCH] tests: Drop sexpr2xmltest MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that we no longer support sexpr conversion to the internal config we can drop the test. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- tests/Makefile.am | 10 +- tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr | 6 - tests/sexpr2xmldata/sexpr2xml-boot-grub.xml | 30 ---- .../sexpr2xml-bridge-ipaddr.sexpr | 10 -- .../sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml | 38 ---- tests/sexpr2xmldata/sexpr2xml-curmem.sexpr | 50 ------ tests/sexpr2xmldata/sexpr2xml-curmem.xml | 44 ----- .../sexpr2xml-disk-block-shareable.sexpr | 6 - .../sexpr2xml-disk-block-shareable.xml | 36 ---- .../sexpr2xmldata/sexpr2xml-disk-block.sexpr | 8 - tests/sexpr2xmldata/sexpr2xml-disk-block.xml | 31 ---- .../sexpr2xml-disk-drv-blktap-qcow.sexpr | 8 - .../sexpr2xml-disk-drv-blktap-qcow.xml | 31 ---- .../sexpr2xml-disk-drv-blktap-raw.sexpr | 8 - .../sexpr2xml-disk-drv-blktap-raw.xml | 31 ---- .../sexpr2xml-disk-drv-blktap2-raw.sexpr | 8 - .../sexpr2xml-disk-drv-blktap2-raw.xml | 31 ---- tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr | 8 - tests/sexpr2xmldata/sexpr2xml-disk-file.xml | 31 ---- .../sexpr2xmldata/sexpr2xml-fv-autoport.sexpr | 86 --------- tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml | 59 ------ .../sexpr2xml-fv-empty-kernel.sexpr | 11 -- .../sexpr2xml-fv-empty-kernel.xml | 52 ------ .../sexpr2xml-fv-force-hpet.sexpr | 11 -- .../sexpr2xmldata/sexpr2xml-fv-force-hpet.xml | 55 ------ .../sexpr2xml-fv-force-nohpet.sexpr | 11 -- .../sexpr2xml-fv-force-nohpet.xml | 55 ------ tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr | 9 - tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml | 36 ---- .../sexpr2xml-fv-legacy-vfb.sexpr | 70 -------- .../sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml | 37 ---- .../sexpr2xml-fv-localtime.sexpr | 10 -- .../sexpr2xmldata/sexpr2xml-fv-localtime.xml | 52 ------ .../sexpr2xml-fv-net-netfront.sexpr | 11 -- .../sexpr2xml-fv-net-netfront.xml | 53 ------ .../sexpr2xml-fv-parallel-tcp.sexpr | 10 -- .../sexpr2xml-fv-parallel-tcp.xml | 57 ------ .../sexpr2xml-fv-serial-dev-2-ports.sexpr | 12 -- .../sexpr2xml-fv-serial-dev-2-ports.xml | 64 ------- .../sexpr2xml-fv-serial-dev-2nd-port.sexpr | 11 -- .../sexpr2xml-fv-serial-dev-2nd-port.xml | 60 ------- .../sexpr2xml-fv-serial-file.sexpr | 12 -- .../sexpr2xml-fv-serial-file.xml | 60 ------- .../sexpr2xml-fv-serial-null.sexpr | 10 -- .../sexpr2xml-fv-serial-null.xml | 58 ------ .../sexpr2xml-fv-serial-pipe.sexpr | 12 -- .../sexpr2xml-fv-serial-pipe.xml | 60 ------- .../sexpr2xml-fv-serial-pty.sexpr | 11 -- .../sexpr2xmldata/sexpr2xml-fv-serial-pty.xml | 58 ------ .../sexpr2xml-fv-serial-stdio.sexpr | 10 -- .../sexpr2xml-fv-serial-stdio.xml | 58 ------ .../sexpr2xml-fv-serial-tcp-telnet.sexpr | 11 -- .../sexpr2xml-fv-serial-tcp-telnet.xml | 62 ------- .../sexpr2xml-fv-serial-tcp.sexpr | 11 -- .../sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml | 62 ------- .../sexpr2xml-fv-serial-udp.sexpr | 11 -- .../sexpr2xmldata/sexpr2xml-fv-serial-udp.xml | 62 ------- .../sexpr2xml-fv-serial-unix.sexpr | 11 -- .../sexpr2xml-fv-serial-unix.xml | 60 ------- .../sexpr2xml-fv-sound-all.sexpr | 11 -- .../sexpr2xmldata/sexpr2xml-fv-sound-all.xml | 54 ------ tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr | 10 -- tests/sexpr2xmldata/sexpr2xml-fv-sound.xml | 54 ------ .../sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr | 10 -- tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml | 53 ------ .../sexpr2xml-fv-usbtablet.sexpr | 10 -- .../sexpr2xmldata/sexpr2xml-fv-usbtablet.xml | 53 ------ tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr | 11 -- tests/sexpr2xmldata/sexpr2xml-fv-utc.xml | 52 ------ tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr | 9 - tests/sexpr2xmldata/sexpr2xml-fv-v2.xml | 52 ------ tests/sexpr2xmldata/sexpr2xml-fv.sexpr | 11 -- tests/sexpr2xmldata/sexpr2xml-fv.xml | 52 ------ .../sexpr2xmldata/sexpr2xml-net-bridged.sexpr | 9 - tests/sexpr2xmldata/sexpr2xml-net-bridged.xml | 37 ---- tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr | 10 -- tests/sexpr2xmldata/sexpr2xml-net-e1000.xml | 38 ---- .../sexpr2xmldata/sexpr2xml-net-routed.sexpr | 10 -- tests/sexpr2xmldata/sexpr2xml-net-routed.xml | 37 ---- .../sexpr2xml-no-source-cdrom.sexpr | 66 ------- .../sexpr2xml-no-source-cdrom.xml | 58 ------ tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr | 10 -- tests/sexpr2xmldata/sexpr2xml-pci-devs.xml | 43 ----- .../sexpr2xml-pv-bootloader-cmdline.sexpr | 5 - .../sexpr2xml-pv-bootloader-cmdline.xml | 31 ---- .../sexpr2xml-pv-bootloader.sexpr | 5 - .../sexpr2xmldata/sexpr2xml-pv-bootloader.xml | 30 ---- .../sexpr2xml-pv-localtime.sexpr | 8 - .../sexpr2xmldata/sexpr2xml-pv-localtime.xml | 31 ---- tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr | 8 - tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml | 31 ---- .../sexpr2xml-pv-vfb-new-vncdisplay.sexpr | 10 -- .../sexpr2xml-pv-vfb-new-vncdisplay.xml | 37 ---- .../sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr | 9 - tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml | 37 ---- .../sexpr2xml-pv-vfb-type-crash.sexpr | 83 --------- .../sexpr2xml-pv-vfb-type-crash.xml | 42 ----- tests/sexpr2xmldata/sexpr2xml-pv.sexpr | 8 - tests/sexpr2xmldata/sexpr2xml-pv.xml | 31 ---- tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr | 11 -- tests/sexpr2xmldata/sexpr2xml-vif-rate.xml | 56 ------ tests/sexpr2xmltest.c | 170 ------------------ tests/virschematest.c | 2 +- 103 files changed, 3 insertions(+), 3298 deletions(-) delete mode 100644 tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-boot-grub.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-curmem.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-curmem.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-block.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-file.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-disk-file.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-autoport.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-kernel.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-localtime.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-file.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-null.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound-all.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-sound.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-utc.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-utc.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-v2.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv-v2.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-fv.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-bridged.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-bridged.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-e1000.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-e1000.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-routed.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-net-routed.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pci-devs.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pci-devs.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-localtime.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-pv.xml delete mode 100644 tests/sexpr2xmldata/sexpr2xml-vif-rate.sexpr delete mode 100644 tests/sexpr2xmldata/sexpr2xml-vif-rate.xml delete mode 100644 tests/sexpr2xmltest.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 90bf94fe08..107f2de859 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -125,7 +125,6 @@ EXTRA_DIST = \ secretxml2xmlin \ securityselinuxhelperdata \ securityselinuxlabeldata \ - sexpr2xmldata \ storagepoolcapsschemadata \ storagepoolschemadata \ storagepoolxml2xmlin \ @@ -267,7 +266,7 @@ endif WITH_SECDRIVER_SELINUX ssh_SOURCES = ssh.c if WITH_LIBXL -test_programs += xlconfigtest sexpr2xmltest \ +test_programs += xlconfigtest \ xmconfigtest libxlxml2domconfigtest test_libraries += libxltestdriver.la libxlmock.la endif WITH_LIBXL @@ -503,11 +502,6 @@ xlconfigtest_SOURCES = \ testutils.c testutils.h xlconfigtest_LDADD =$(libxl_LDADDS) -sexpr2xmltest_SOURCES = \ - sexpr2xmltest.c testutilsxen.c testutilsxen.h \ - testutils.c testutils.h -sexpr2xmltest_LDADD = $(libxl_LDADDS) - xmconfigtest_SOURCES = \ xmconfigtest.c testutilsxen.c testutilsxen.h \ testutils.c testutils.h @@ -525,7 +519,7 @@ libxlmock_la_LDFLAGS = $(MOCKLIBS_LDFLAGS) libxlmock_la_LIBADD = $(MOCKLIBS_LIBS) else ! WITH_LIBXL -EXTRA_DIST += xlconfigtest.c sexpr2xmltest.c \ +EXTRA_DIST += xlconfigtest.c \ xmconfigtest.c libxlxml2domconfigtest.c endif ! WITH_LIBXL diff --git a/tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr b/tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr deleted file mode 100644 index c8c0cb1ef3..0000000000 --- a/tests/sexpr2xmldata/sexpr2xml-boot-grub.sexpr +++ /dev/null @@ -1,6 +0,0 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ -(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ -(on_reboot 'destroy')(on_crash 'destroy')\ -(image (linux (kernel '/usr/lib/xen/boot/pv-grub-x86_64.gz')\ -(args '(hd0,0)/grub/menu.lst')))(device (vbd (dev 'xvda')\ -(uname 'phy:/dev/MainVG/GuestVG')(mode 'w')))) diff --git a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml b/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml deleted file mode 100644 index 0889c68ed0..0000000000 --- a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml +++ /dev/null @@ -1,30 +0,0 @@ - - pvtest - 596a5d21-71f4-8fb2-e068-e2386a5c413e - 430080 - 430080 - 2 - - linux - /usr/lib/xen/boot/pv-grub-x86_64.gz - (hd0,0)/grub/menu.lst - - - destroy - destroy - destroy - - - - - - - - - - - - - - - diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr deleted file mode 100644 index cb9e3f8bf9..0000000000 --- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.sexpr +++ /dev/null @@ -1,10 +0,0 @@ -(domain (domid 6)(name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ -(uuid '596a5d2171f48fb2e068e2386a5c413e')(on_poweroff 'destroy')\ -(on_reboot 'destroy')(on_crash 'destroy')\ -(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')\ -(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 ')))(device (vbd (dev 'xvda')\ -(uname 'file:/root/some.img')(mode 'w')))\ -(device (vif (mac '00:11:22:33:44:55')(bridge 'xenbr2')\ -(script 'vif-bridge')(ip '192.0.2.1'))) diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml deleted file mode 100644 index 9c83847afe..0000000000 --- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml +++ /dev/null @@ -1,38 +0,0 @@ - - pvtest - 596a5d21-71f4-8fb2-e068-e2386a5c413e - 430080 - 430080 - 2 - - linux - /var/lib/xen/vmlinuz.2Dn2YT - /var/lib/xen/initrd.img.0u-Vhq - method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os - - - destroy - destroy - destroy - - - - - - - - - - - -