From nobody Sun May 5 15:37:04 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562157541; cv=none; d=zoho.com; s=zohoarc; b=W+XrVOvzRt/nEbPItv4jLInp736Z0OmLHFu4Tqed29CSDijbEmRL09PWyFFp8yQMvTRQsyh+SBisNU54vP3yZ1czGxr3lJJ+DATsf7+Y/90FO/SAd01LyiZ6x6ZFXi83iDEaG2kQyUTIbmGV6p/1/iOuhjDJuC7+6SI8+ze6Z7I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562157541; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=gEyig/J0A/2V8VUQ0+qXFs4Plh7RGXE8a8X5IuLTBJk=; b=AUH3qLThgyxO83ZvDv3YT8fO8pIBLYtXKBazEN/fJpDsHznxku1vEy6+072YL3YhF2TB6T94wTUMOXvX+By4SJAGV8D9FHhA3wBoYiInSETKGpAtB1nmgJtQpgGD7swoMH3g7AZrOpHgKmwMtDG6Asm/6R4rIwPyZJfud/qzRBM= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1562157541396252.64998893560278; Wed, 3 Jul 2019 05:39:01 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B3AE83091799; Wed, 3 Jul 2019 12:38:34 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1C8587BE6C; Wed, 3 Jul 2019 12:38:24 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 33A82E161; Wed, 3 Jul 2019 12:38:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x63CcBOG007613 for ; Wed, 3 Jul 2019 08:38:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 75B4C8958A; Wed, 3 Jul 2019 12:38:11 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81E25834EB for ; Wed, 3 Jul 2019 12:38:10 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Wed, 3 Jul 2019 14:37:53 +0200 Message-Id: <2d604b03a21b4989953ffaabc9d6f9c77dc3ccd3.1562157378.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 01/14] tests: Remove xml2sexprtest X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Wed, 03 Jul 2019 12:38:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" The test was the only place calling 'xenFormatSxpr'. Drop it as there are no other users of that code since we've dropped xend support. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- tests/Makefile.am | 10 +- tests/virschematest.c | 2 +- tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr | 6 - tests/xml2sexprdata/xml2sexpr-boot-grub.xml | 21 --- .../xml2sexpr-bridge-ipaddr.sexpr | 12 -- .../xml2sexprdata/xml2sexpr-bridge-ipaddr.xml | 29 --- tests/xml2sexprdata/xml2sexpr-curmem.sexpr | 7 - tests/xml2sexprdata/xml2sexpr-curmem.xml | 23 --- .../xml2sexpr-disk-block-shareable.sexpr | 9 - .../xml2sexpr-disk-block-shareable.xml | 31 ---- .../xml2sexprdata/xml2sexpr-disk-block.sexpr | 10 -- tests/xml2sexprdata/xml2sexpr-disk-block.xml | 22 --- .../xml2sexpr-disk-drv-blkback.sexpr | 10 -- .../xml2sexpr-disk-drv-blkback.xml | 23 --- .../xml2sexpr-disk-drv-blktap-qcow.sexpr | 10 -- .../xml2sexpr-disk-drv-blktap-qcow.xml | 23 --- .../xml2sexpr-disk-drv-blktap-raw.sexpr | 10 -- .../xml2sexpr-disk-drv-blktap-raw.xml | 23 --- .../xml2sexpr-disk-drv-blktap.sexpr | 10 -- .../xml2sexpr-disk-drv-blktap.xml | 23 --- .../xml2sexpr-disk-drv-blktap2-raw.sexpr | 10 -- .../xml2sexpr-disk-drv-blktap2-raw.xml | 23 --- .../xml2sexpr-disk-drv-blktap2.sexpr | 10 -- .../xml2sexpr-disk-drv-blktap2.xml | 23 --- .../xml2sexpr-disk-drv-loop.sexpr | 10 -- .../xml2sexprdata/xml2sexpr-disk-drv-loop.xml | 23 --- tests/xml2sexprdata/xml2sexpr-disk-file.sexpr | 10 -- tests/xml2sexprdata/xml2sexpr-disk-file.xml | 22 --- tests/xml2sexprdata/xml2sexpr-escape.sexpr | 11 -- tests/xml2sexprdata/xml2sexpr-escape.xml | 24 --- .../xml2sexpr-fv-force-hpet.sexpr | 12 -- .../xml2sexprdata/xml2sexpr-fv-force-hpet.xml | 39 ---- .../xml2sexpr-fv-force-nohpet.sexpr | 12 -- .../xml2sexpr-fv-force-nohpet.xml | 39 ---- tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr | 12 -- tests/xml2sexprdata/xml2sexpr-fv-kernel.xml | 24 --- .../xml2sexpr-fv-localtime.sexpr | 12 -- .../xml2sexprdata/xml2sexpr-fv-localtime.xml | 37 ---- .../xml2sexpr-fv-net-many-models.sexpr | 1 - .../xml2sexpr-fv-net-many-models.xml | 43 ----- .../xml2sexpr-fv-net-netfront.sexpr | 10 -- .../xml2sexpr-fv-net-netfront.xml | 31 ---- .../xml2sexprdata/xml2sexpr-fv-net-rate.sexpr | 10 -- tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml | 34 ---- .../xml2sexpr-fv-parallel-tcp.sexpr | 12 -- .../xml2sexpr-fv-parallel-tcp.xml | 40 ----- .../xml2sexpr-fv-serial-dev-2-ports.sexpr | 13 -- .../xml2sexpr-fv-serial-dev-2-ports.xml | 44 ----- .../xml2sexpr-fv-serial-dev-2nd-port.sexpr | 12 -- .../xml2sexpr-fv-serial-dev-2nd-port.xml | 40 ----- .../xml2sexpr-fv-serial-file.sexpr | 13 -- .../xml2sexpr-fv-serial-file.xml | 40 ----- .../xml2sexpr-fv-serial-null.sexpr | 12 -- .../xml2sexpr-fv-serial-null.xml | 39 ---- .../xml2sexpr-fv-serial-pipe.sexpr | 13 -- .../xml2sexpr-fv-serial-pipe.xml | 40 ----- .../xml2sexpr-fv-serial-pty.sexpr | 12 -- .../xml2sexprdata/xml2sexpr-fv-serial-pty.xml | 39 ---- .../xml2sexpr-fv-serial-stdio.sexpr | 12 -- .../xml2sexpr-fv-serial-stdio.xml | 39 ---- .../xml2sexpr-fv-serial-tcp-telnet.sexpr | 13 -- .../xml2sexpr-fv-serial-tcp-telnet.xml | 41 ----- .../xml2sexpr-fv-serial-tcp.sexpr | 13 -- .../xml2sexprdata/xml2sexpr-fv-serial-tcp.xml | 40 ----- .../xml2sexpr-fv-serial-udp.sexpr | 13 -- .../xml2sexprdata/xml2sexpr-fv-serial-udp.xml | 41 ----- .../xml2sexpr-fv-serial-unix.sexpr | 13 -- .../xml2sexpr-fv-serial-unix.xml | 40 ----- tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr | 12 -- tests/xml2sexprdata/xml2sexpr-fv-sound.xml | 38 ---- .../xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr | 12 -- tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml | 37 ---- .../xml2sexpr-fv-usbtablet.sexpr | 10 -- .../xml2sexprdata/xml2sexpr-fv-usbtablet.xml | 36 ---- tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr | 12 -- tests/xml2sexprdata/xml2sexpr-fv-utc.xml | 37 ---- tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr | 11 -- .../xml2sexpr-fv-vncunused.sexpr | 11 -- .../xml2sexprdata/xml2sexpr-fv-vncunused.xml | 36 ---- tests/xml2sexprdata/xml2sexpr-fv.sexpr | 12 -- tests/xml2sexprdata/xml2sexpr-fv.xml | 36 ---- .../xml2sexprdata/xml2sexpr-net-bridged.sexpr | 11 -- tests/xml2sexprdata/xml2sexpr-net-bridged.xml | 28 --- tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr | 11 -- tests/xml2sexprdata/xml2sexpr-net-e1000.xml | 29 --- .../xml2sexprdata/xml2sexpr-net-routed.sexpr | 11 -- tests/xml2sexprdata/xml2sexpr-net-routed.xml | 28 --- .../xml2sexpr-no-source-cdrom.sexpr | 10 -- .../xml2sexpr-no-source-cdrom.xml | 37 ---- tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr | 10 -- tests/xml2sexprdata/xml2sexpr-pci-devs.xml | 32 ---- .../xml2sexpr-pv-bootloader-cmdline.sexpr | 6 - .../xml2sexpr-pv-bootloader-cmdline.xml | 22 --- .../xml2sexpr-pv-bootloader.sexpr | 7 - .../xml2sexprdata/xml2sexpr-pv-bootloader.xml | 18 -- .../xml2sexpr-pv-localtime.sexpr | 8 - .../xml2sexprdata/xml2sexpr-pv-localtime.xml | 25 --- tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr | 9 - tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml | 22 --- .../xml2sexpr-pv-vfb-new-auto.sexpr | 11 -- .../xml2sexpr-pv-vfb-new-auto.xml | 23 --- .../xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 11 -- tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml | 23 --- tests/xml2sexprdata/xml2sexpr-pv.sexpr | 9 - tests/xml2sexprdata/xml2sexpr-pv.xml | 22 --- tests/xml2sexprtest.c | 167 ------------------ 106 files changed, 3 insertions(+), 2317 deletions(-) delete mode 100644 tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-boot-grub.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-curmem.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-curmem.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block-shareable.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-block.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-loop.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-file.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-disk-file.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-escape.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-escape.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-kernel.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-kernel.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-localtime.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-localtime.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-many-models.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-netfront.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-rate.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-net-rate.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.sex= pr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.se= xpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-file.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-null.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pty.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-udp.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-unix.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-sound.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-sound.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbtablet.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-utc.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-utc.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-v2.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-vncunused.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-fv.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-bridged.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-bridged.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-e1000.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-e1000.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-routed.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-net-routed.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-no-source-cdrom.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pci-devs.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pci-devs.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.sex= pr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-localtime.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-localtime.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv.sexpr delete mode 100644 tests/xml2sexprdata/xml2sexpr-pv.xml delete mode 100644 tests/xml2sexprtest.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 115afa1c1a..c591a39631 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -158,7 +158,6 @@ EXTRA_DIST =3D \ vmx2xmldata \ xlconfigdata \ xmconfigdata \ - xml2sexprdata \ xml2vmxdata \ virstorageutildata \ virfilecachedata \ @@ -268,7 +267,7 @@ endif WITH_SECDRIVER_SELINUX ssh_SOURCES =3D ssh.c if WITH_LIBXL -test_programs +=3D xlconfigtest xml2sexprtest sexpr2xmltest \ +test_programs +=3D xlconfigtest sexpr2xmltest \ xmconfigtest libxlxml2domconfigtest test_libraries +=3D libxltestdriver.la libxlmock.la endif WITH_LIBXL @@ -504,11 +503,6 @@ xlconfigtest_SOURCES =3D \ testutils.c testutils.h xlconfigtest_LDADD =3D$(libxl_LDADDS) -xml2sexprtest_SOURCES =3D \ - xml2sexprtest.c testutilsxen.c testutilsxen.h \ - testutils.c testutils.h -xml2sexprtest_LDADD =3D $(libxl_LDADDS) - sexpr2xmltest_SOURCES =3D \ sexpr2xmltest.c testutilsxen.c testutilsxen.h \ testutils.c testutils.h @@ -531,7 +525,7 @@ libxlmock_la_LDFLAGS =3D $(MOCKLIBS_LDFLAGS) libxlmock_la_LIBADD =3D $(MOCKLIBS_LIBS) else ! WITH_LIBXL -EXTRA_DIST +=3D xlconfigtest.c xml2sexprtest.c sexpr2xmltest.c \ +EXTRA_DIST +=3D xlconfigtest.c sexpr2xmltest.c \ xmconfigtest.c libxlxml2domconfigtest.c endif ! WITH_LIBXL diff --git a/tests/virschematest.c b/tests/virschematest.c index ff25f7781e..e5bfcde729 100644 --- a/tests/virschematest.c +++ b/tests/virschematest.c @@ -217,7 +217,7 @@ mymain(void) DO_TEST_DIR("capability.rng", "capabilityschemadata", "vircaps2xmldata= "); DO_TEST_DIR("domain.rng", "domainschemadata", "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata", - "xml2sexprdata", "qemuxml2xmloutdata", "lxcxml2xmldata", + "qemuxml2xmloutdata", "lxcxml2xmldata", "lxcxml2xmloutdata", "bhyvexml2argvdata", "genericxml2xmli= ndata", "genericxml2xmloutdata", "xlconfigdata", "libxlxml2domconf= igdata", "qemuhotplugtestdomains"); diff --git a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr b/tests/xml2sexp= rdata/xml2sexpr-boot-grub.sexpr deleted file mode 100644 index 923d282e22..0000000000 --- a/tests/xml2sexprdata/xml2sexpr-boot-grub.sexpr +++ /dev/null @@ -1,6 +0,0 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ -(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(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= ')\ -(localtime 0)))(localtime 0)\ -(device (vbd (dev 'xvda')(uname 'phy:/dev/MainVG/GuestLV')(mode 'w'))))\ diff --git a/tests/xml2sexprdata/xml2sexpr-boot-grub.xml b/tests/xml2sexprd= ata/xml2sexpr-boot-grub.xml deleted file mode 100644 index c4b92dcd00..0000000000 --- a/tests/xml2sexprdata/xml2sexpr-boot-grub.xml +++ /dev/null @@ -1,21 +0,0 @@ - - pvtest - 596a5d2171f48fb2e068e2386a5c413e - - linux - /usr/lib/xen/boot/pv-grub-x86_64.gz - (hd0,0)/grub/menu.lst - - 430080 - 2 - destroy - destroy - destroy - - - - - - - - diff --git a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr b/tests/xml2= sexprdata/xml2sexpr-bridge-ipaddr.sexpr deleted file mode 100644 index 68305074f8..0000000000 --- a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.sexpr +++ /dev/null @@ -1,12 +0,0 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)\ -(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(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=3Dhttp://download.fedora.devel.redhat.com/pub/fedora/linux/\ -core/test/5.91/x86_64/os ')(localtime 0)))\ -(localtime 0)\ -(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/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml b/tests/xml2se= xprdata/xml2sexpr-bridge-ipaddr.xml deleted file mode 100644 index d72f986915..0000000000 --- a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml +++ /dev/null @@ -1,29 +0,0 @@ - - pvtest - 596a5d2171f48fb2e068e2386a5c413e - - linux - /var/lib/xen/vmlinuz.2Dn2YT - /var/lib/xen/initrd.img.0u-Vhq - method=3Dhttp://download.fedora.devel.redhat.com/pub/fedora/= linux/core/test/5.91/x86_64/os - - 430080 - 2 - destroy - destroy - destroy - - - - - - - - - -