From da61daa2e6dd474f2a6074dc49e1a68597aac14e Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 24 Feb 2009 14:58:32 +0000 Subject: [PATCH] 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. --- ChangeLog | 11 +++++++++++ tests/.cvsignore | 1 + tests/.gitignore | 1 + tests/Makefile.am | 9 +++++++++ tests/nodedevschemadata/DVD_GCC_4247N.xml | 2 -- tests/nodedevschemadata/computer.xml | 2 -- tests/nodedevschemadata/net_00_13_02_b9_f9_d3.xml | 2 -- tests/nodedevschemadata/net_00_15_58_2f_e9_55.xml | 2 -- tests/nodedevschemadata/pci_1002_71c4.xml | 2 -- tests/nodedevschemadata/pci_8086_27c5_scsi_host.xml | 2 -- tests/nodedevschemadata/pci_8086_27c5_scsi_host_0.xml | 2 -- .../pci_8086_27c5_scsi_host_scsi_device_lun0.xml | 2 -- .../pci_8086_27c5_scsi_host_scsi_host.xml | 2 -- ...age_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml | 2 -- .../usb_device_1d6b_1_0000_00_1d_0.xml | 2 -- .../usb_device_1d6b_1_0000_00_1d_0_if0.xml | 2 -- 16 files changed, 22 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07681a9afc..79f91e478c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue Feb 24 14:55:28 GMT 2009 Mark McLoughlin + + * 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 * src/libvirt_private.syms, src/node_device_conf.[ch]: diff --git a/tests/.cvsignore b/tests/.cvsignore index 679cc20637..9d809c958b 100644 --- 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 679cc20637..9d809c958b 100644 --- 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 877884f337..bec4f60548 100644 --- 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 d81e9834a5..aed787a6c3 100644 --- a/tests/nodedevschemadata/DVD_GCC_4247N.xml +++ b/tests/nodedevschemadata/DVD_GCC_4247N.xml @@ -13,5 +13,3 @@ - - diff --git a/tests/nodedevschemadata/computer.xml b/tests/nodedevschemadata/computer.xml index 4172c0c2ff..4e4b9188b3 100644 --- a/tests/nodedevschemadata/computer.xml +++ b/tests/nodedevschemadata/computer.xml @@ -14,5 +14,3 @@ - - 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 9a09246561..970ccca366 100644 --- 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 @@ - - 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 b13215c373..741c959137 100644 --- 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 @@ - - diff --git a/tests/nodedevschemadata/pci_1002_71c4.xml b/tests/nodedevschemadata/pci_1002_71c4.xml index 305ca32296..6de09c1c6e 100644 --- a/tests/nodedevschemadata/pci_1002_71c4.xml +++ b/tests/nodedevschemadata/pci_1002_71c4.xml @@ -10,5 +10,3 @@ ATI Technologies Inc - - diff --git a/tests/nodedevschemadata/pci_8086_27c5_scsi_host.xml b/tests/nodedevschemadata/pci_8086_27c5_scsi_host.xml index 47937f1c7b..3b377a383f 100644 --- a/tests/nodedevschemadata/pci_8086_27c5_scsi_host.xml +++ b/tests/nodedevschemadata/pci_8086_27c5_scsi_host.xml @@ -5,5 +5,3 @@ 0 - - diff --git a/tests/nodedevschemadata/pci_8086_27c5_scsi_host_0.xml b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_0.xml index b58ee73ed5..a160167824 100644 --- a/tests/nodedevschemadata/pci_8086_27c5_scsi_host_0.xml +++ b/tests/nodedevschemadata/pci_8086_27c5_scsi_host_0.xml @@ -5,5 +5,3 @@ 1 - - 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 09887a861e..5c2dff7b01 100644 --- 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 @@ disk - - 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 18f95003ae..8ffb0a5bb8 100644 --- 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 @@ 0 - - diff --git a/tests/nodedevschemadata/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml b/tests/nodedevschemadata/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml index 43294ac551..3595a0baaa 100644 --- a/tests/nodedevschemadata/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml +++ b/tests/nodedevschemadata/storage_serial_SATA_HTS721010G9SA00_MPCZ12Y0GNGWSE.xml @@ -10,5 +10,3 @@ 100030242816 - - 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 05999e8101..29533e769b 100644 --- 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 @@ Linux Foundation - - 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 bc951ffdf2..9de35c7e8c 100644 --- 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 @@ 0 - -