Add nodedevxml2xml test

Add a test to check node device XML parsing by first parsing
the XML, then re-formatting as XML and finally comparing the
resulting XML to the original XML.

diff --git a/ChangeLog b/ChangeLog
index 07681a9afcb3e75f6218ca5c90fc06290591b4b4..79f91e478c59361464df944b7f1312f55cdffb80 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Feb 24 14:55:28 GMT 2009 Mark McLoughlin <markmc@redhat.com>
+
+       * tests/nodedevxml2xmltest.c: Add a test to check node
+       device XML parsing by first parsing the XML, then
+       re-formatting as XML and finally comparing the resulting
+       XML to the original XML.
+
+       * tests/nodedevschemadata/*.xml: strip trailing newlines.
+
+       * tests/Makefile.am, tests/.*ignore: adminstrivia
+
 Tue Feb 24 14:54:05 GMT 2009 Mark McLoughlin <markmc@redhat.com>
 
        *  src/libvirt_private.syms, src/node_device_conf.[ch]:

diff --git a/tests/.cvsignore b/tests/.cvsignore
index 679cc206377ba3f1c0aa4d2262d3f6b495476388..9d809c958b2213158a48d6e3b4ddb024d0358aa3 100644 (file)
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
@@ -11,6 +11,7 @@ xmconfigtest
 xencapstest
 qemuxml2xmltest
 qemuxml2argvtest
+nodedevxml2xmltest
 nodeinfotest
 statstest
 qparamtest

diff --git a/tests/.gitignore b/tests/.gitignore
index 679cc206377ba3f1c0aa4d2262d3f6b495476388..9d809c958b2213158a48d6e3b4ddb024d0358aa3 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -11,6 +11,7 @@ xmconfigtest
 xencapstest
 qemuxml2xmltest
 qemuxml2argvtest
+nodedevxml2xmltest
 nodeinfotest
 statstest
 qparamtest

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 877884f337a053b1218c24b5ad97b678363fcffe..bec4f60548f20089ec8ee0bf707c2d3aaff4f043 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -64,6 +64,8 @@ if WITH_QEMU
 noinst_PROGRAMS += qemuxml2argvtest qemuxml2xmltest
 endif
 
+noinst_PROGRAMS += nodedevxml2xmltest
+
 test_scripts = \
        capabilityschematest \
        networkschematest \
@@ -110,6 +112,8 @@ if WITH_QEMU
 TESTS += qemuxml2argvtest qemuxml2xmltest
 endif
 
+TESTS += nodedevxml2xmltest
+
 path_add = $$abs_top_builddir/src$(PATH_SEPARATOR)$$abs_top_builddir/qemud
 
 # NB, automake < 1.10 does not provide the real
@@ -175,6 +179,11 @@ else
 EXTRA_DIST += qemuxml2argvtest.c qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h
 endif
 
+nodedevxml2xmltest_SOURCES = \
+       nodedevxml2xmltest.c \
+       testutils.c testutils.h
+nodedevxml2xmltest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS)
+
 virshtest_SOURCES = \
        virshtest.c \
        testutils.c testutils.h

diff --git a/tests/nodedevschemadata/DVD_GCC_4247N.xml b/tests/nodedevschemadata/DVD_GCC_4247N.xml
index d81e9834a532bb912cd0df4523e18482e7d4173f..aed787a6c37d62d61e23b8a4b39ba86b42b1f408 100644 (file)
--- a/tests/nodedevschemadata/DVD_GCC_4247N.xml
+++ b/tests/nodedevschemadata/DVD_GCC_4247N.xml
@@ -13,5 +13,3 @@
     </capability>
   </capability>
 </device>
-
-

diff --git a/tests/nodedevschemadata/computer.xml b/tests/nodedevschemadata/computer.xml
index 4172c0c2ff8e0f7cbe16d6454110e424244f71a1..4e4b9188b32aed3d6467d1ca6d9f2ddf00e9bff2 100644 (file)
--- a/tests/nodedevschemadata/computer.xml
+++ b/tests/nodedevschemadata/computer.xml
@@ -14,5 +14,3 @@
     </firmware>
   </capability>
 </device>
-
-

diff --git a/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml
index 9a09246561e5a487e756ed4c976dbfd3dafde845..970ccca36666e5b8ffb8025a80bd7a88bb2cf98b 100644 (file)
--- a/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml
+++ b/tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml
@@ -7,5 +7,3 @@
     <capability type='80211'/>
   </capability>
 </device>
-
-

diff --git a/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml
index b13215c37368d2190b1feb8ed0ec4c58663342d4..741c95913732464148ae1fdfcba63d3d0e56f116 100644 (file)
--- a/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml
+++ b/tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml
@@ -7,5 +7,3 @@
     <capability type='80203'/>
   </capability>
 </device>
-
-

diff --git a/tests/nodedevschemadata/pci_1002_71c4.xml b/tests/nodedevschemadata/pci_1002_71c4.xml
index 305ca32296401875865ee66ed95d769e10a8abf3..6de09c1c6edd225d0e46635c56cfc87f4939d814 100644 (file)
--- a/tests/nodedevschemadata/pci_1002_71c4.xml
+++ b/tests/nodedevschemadata/pci_1002_71c4.xml
@@ -10,5 +10,3 @@
     <vendor id='0x1002'>ATI Technologies Inc</vendor>
   </capability>
 </device>
-
-

diff --git a/tests/nodedevschemadata/pci_8086_27c5_scsi_host.xml b/tests/nodedevschemadata/pci_8086_27c5_scsi_host.xml
index 47937f1c7b6273a26cfa0fb2d89e84722f27b59b..3b377a383f9ddd4d213232ae5beb3e596ca44f26 100644 (file)
--- a/tests/nodedevschemadata/pci_8086_27c5_scsi_host.xml
+++ b/tests/nodedevschemadata/pci_8086_27c5_scsi_host.xml
@@ -5,5 +5,3 @@
     <host>0</host>
   </capability>
 </device>
-
-

diff --git a/tests/nodedevschemadata/pci_8086_27c5_scsi_host_0.xml b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_0.xml
index b58ee73ed5840359148e8cb9e21a76475a462d89..a160167824b1b36e04920fa5ffd63253e9adc01c 100644 (file)
--- a/tests/nodedevschemadata/pci_8086_27c5_scsi_host_0.xml
+++ b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_0.xml
@@ -5,5 +5,3 @@
     <host>1</host>
   </capability>
 </device>
-
-

diff --git a/tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_device_lun0.xml b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_device_lun0.xml
index 09887a861e22171f67be22aaffe38a3c514b70c5..5c2dff7b01350805e301b0844de540272acc18c3 100644 (file)
--- a/tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_device_lun0.xml
+++ b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_device_lun0.xml
@@ -9,5 +9,3 @@
     <type>disk</type>
   </capability>
 </device>
-
-

diff --git a/tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_host.xml b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_host.xml
index 18f95003ae6c3542a23e8788c7f28b707655daa9..8ffb0a5bb88131e6a637db218c706754c7d414b9 100644 (file)
--- a/tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_host.xml
+++ b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_scsi_host.xml
@@ -5,5 +5,3 @@
     <host>0</host>
   </capability>
 </device>
-
-

diff --git a/tests/nodedevschemadata/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml b/tests/nodedevschemadata/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml
index 43294ac551d8606dfd61fa5925b0d7928ea2029f..3595a0baaabcc051010ac416063971542f3a0190 100644 (file)
--- a/tests/nodedevschemadata/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml
+++ b/tests/nodedevschemadata/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml
@@ -10,5 +10,3 @@
     <size>100030242816</size>
   </capability>
 </device>
-
-

diff --git a/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0.xml b/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0.xml
index 05999e8101c9624d6c197d45a7363704a614ce89..29533e769b3dd8717ab87e2a95655e93f5b5a290 100644 (file)
--- a/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0.xml
+++ b/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0.xml
@@ -8,5 +8,3 @@
     <vendor id='0x1d6b'>Linux Foundation</vendor>
   </capability>
 </device>
-
-

diff --git a/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0_if0.xml b/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0_if0.xml
index bc951ffdf2eafdcc7a841d14eda0261e1ecc586e..9de35c7e8cd6ed3bfb44347a90704df3138465b0 100644 (file)
--- a/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0_if0.xml
+++ b/tests/nodedevschemadata/usb_device_1d6b_1_0000_00_1d_0_if0.xml
@@ -8,5 +8,3 @@
     <protocol>0</protocol>
   </capability>
 </device>
-
-