Xen: tests: remove old sexpr2xml tests

Remove s-expression to XML conversion tests for old xend 3.0.2
config format.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr b/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr
deleted file mode 100644 (file)
index e7031dc..0000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.sexpr
+++ /dev/null
@@ -1,9 +0,0 @@
-(domain (domid 3)(name 'fvtest')(memory 400)(maxmem 400)(vcpus 1)\
-(uuid 'b5d70dd275cdaca517769660b059d8bc')(on_poweroff 'destroy')\
-(on_reboot 'restart')(on_crash 'restart')\
-(image (hvm (kernel '/usr/lib/xen/boot/hvmloader')\
-(device_model '/usr/lib64/xen/bin/qemu-dm')(boot c)(cdrom '/root/boot.iso')\
-(acpi 1)(vnc 1)(keymap ja)))(device (vbd (dev 'ioemu:hda')\
-(uname 'file:/root/foo.img')(mode 'w')))\
-(device (vif (mac '00:16:3e:1b:b1:47')(bridge 'xenbr0')\
-(script 'vif-bridge')(model 'e1000')(type 'ioemu'))))

diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml
deleted file mode 100644 (file)
index ec75365..0000000
--- a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<domain type='xen' id='3'>
-  <name>fvtest</name>
-  <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid>
-  <memory unit='KiB'>409600</memory>
-  <currentMemory unit='KiB'>409600</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type>hvm</type>
-    <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-  </features>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>restart</on_crash>
-  <devices>
-    <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
-    <disk type='file' device='disk'>
-      <driver name='file'/>
-      <source file='/root/foo.img'/>
-      <backingStore/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <disk type='file' device='cdrom'>
-      <driver name='file'/>
-      <source file='/root/boot.iso'/>
-      <backingStore/>
-      <target dev='hdc' bus='ide'/>
-      <readonly/>
-      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
-    </disk>
-    <interface type='bridge'>
-      <mac address='00:16:3e:1b:b1:47'/>
-      <source bridge='xenbr0'/>
-      <script path='vif-bridge'/>
-      <target dev='vif3.0'/>
-      <model type='e1000'/>
-    </interface>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='vnc' port='5903' autoport='no' keymap='ja'/>
-    <memballoon model='xen'/>
-  </devices>
-</domain>

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr
deleted file mode 100644 (file)
index c825f32..0000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.sexpr
+++ /dev/null
@@ -1,9 +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  ')(vnc 1)(vncunused 1)(vnclisten 0.0.0.0)\
-(vncpasswd 123456)(keymap ja)))(device (vbd (dev 'xvda')\
-(uname 'file:/root/some.img')(mode 'w'))))

diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
deleted file mode 100644 (file)
index f5b80c8..0000000
--- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<domain type='xen' id='6'>
-  <name>pvtest</name>
-  <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid>
-  <memory unit='KiB'>430080</memory>
-  <currentMemory unit='KiB'>430080</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <os>
-    <type>linux</type>
-    <kernel>/var/lib/xen/vmlinuz.2Dn2YT</kernel>
-    <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd>
-    <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os  </cmdline>
-  </os>
-  <clock offset='utc' adjustment='reset'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>destroy</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <disk type='file' device='disk'>
-      <driver name='file'/>
-      <source file='/root/some.img'/>
-      <backingStore/>
-      <target dev='xvda' bus='xen'/>
-    </disk>
-    <console type='pty'>
-      <target type='xen' port='0'/>
-    </console>
-    <input type='mouse' bus='xen'/>
-    <input type='keyboard' bus='xen'/>
-    <graphics type='vnc' port='-1' autoport='yes' listen='0.0.0.0' keymap='ja'>
-      <listen type='address' address='0.0.0.0'/>
-    </graphics>
-    <memballoon model='xen'/>
-  </devices>
-</domain>

diff --git a/tests/sexpr2xmltest.c b/tests/sexpr2xmltest.c
index f7f61ccde31d8e5f947663dc4031ec9201f2d629..c95de9fcd162f2625f55c41d4d75200c9802bb65 100644 (file)
--- a/tests/sexpr2xmltest.c
+++ b/tests/sexpr2xmltest.c
@@ -136,7 +136,6 @@ mymain(void)
     DO_TEST("fv", "fv", 1);
     DO_TEST("pv", "pv", 2);
     DO_TEST("fv-v2", "fv-v2", 2);
-    DO_TEST("pv-vfb-orig", "pv-vfb-orig", 2);
     DO_TEST("pv-vfb-new", "pv-vfb-new", 3);
     DO_TEST("pv-vfb-new-vncdisplay", "pv-vfb-new-vncdisplay", 3);
     DO_TEST("pv-vfb-type-crash", "pv-vfb-type-crash", 3);
@@ -185,7 +184,6 @@ mymain(void)
     DO_TEST("fv-sound", "fv-sound", 1);
     DO_TEST("fv-sound-all", "fv-sound-all", 1);
 
-    DO_TEST("fv-net-ioemu", "fv-net-ioemu", 1);
     DO_TEST("fv-net-netfront", "fv-net-netfront", 1);
 
     DO_TEST("fv-empty-kernel", "fv-empty-kernel", 1);