From nobody Wed May 14 18:31:59 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1519304195539591.9773611717773; Thu, 22 Feb 2018 04:56:35 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 11557757C9; Thu, 22 Feb 2018 12:56: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 CE4655EDEB; Thu, 22 Feb 2018 12:56:33 +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 8D13B4A477; Thu, 22 Feb 2018 12:56:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1MCuOrp010803 for ; Thu, 22 Feb 2018 07:56:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id 8B15CAF03A; Thu, 22 Feb 2018 12:56:24 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C685AB58E; Thu, 22 Feb 2018 12:56:23 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:04 +0000 Message-Id: <20180222125617.6768-4-berrange@redhat.com> In-Reply-To: <20180222125617.6768-1-berrange@redhat.com> References: <20180222125617.6768-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v1 03/16] make: split test driver build rules into test/Makefile.inc.am 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-Type: text/plain; charset="utf-8" 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 22 Feb 2018 12:56:34 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 21 +-------------------- src/test/Makefile.inc.am | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 20 deletions(-) create mode 100644 src/test/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 15549ec5b8..bec7930c2b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -72,6 +72,7 @@ libvirt_la_BUILT_LIBADD =3D =20 include uml/Makefile.inc.am include phyp/Makefile.inc.am +include test/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -776,7 +777,6 @@ DRIVER_SOURCE_FILES +=3D \ $(REMOTE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ - $(TEST_DRIVER_SOURCES) \ $(VBOX_DRIVER_SOURCES) \ vbox/vbox_tmpl.c \ $(VMWARE_DRIVER_SOURCES) \ @@ -824,11 +824,6 @@ check-local: check-protocol check-symfile check-symsor= ting \ check-aclperms check-admin-symfile check-admin-symsorting .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=3Dstruct) =20 -# Mock driver, covering domains, storage, networks, etc -TEST_DRIVER_SOURCES =3D \ - test/test_driver.c test/test_driver.h -TEST_DRIVER_ASSETS =3D test/test-screenshot.png - # Now the Hypervisor specific drivers XEN_DRIVER_SOURCES =3D \ xen/block_stats.c xen/block_stats.h \ @@ -1338,18 +1333,6 @@ GENERATED_SYM_FILES =3D \ libvirt_admin.syms libvirt_admin.def \ $(NULL) =20 -if WITH_TEST - -driver_test_asset_DATA =3D $(TEST_DRIVER_ASSETS) -driver_test_assetdir =3D $(pkgdatadir) - -noinst_LTLIBRARIES +=3D libvirt_driver_test.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_test.la -libvirt_driver_test_la_CFLAGS =3D \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_driver_test_la_SOURCES =3D $(TEST_DRIVER_SOURCES) -endif WITH_TEST - if WITH_REMOTE noinst_LTLIBRARIES +=3D libvirt_driver_remote.la libvirt_la_BUILT_LIBADD +=3D libvirt_driver_remote.la @@ -2106,8 +2089,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispa= tch.pl \ =20 # Add all conditional sources just in case... EXTRA_DIST +=3D \ - $(TEST_DRIVER_SOURCES) \ - $(TEST_DRIVER_ASSETS) \ $(REMOTE_DRIVER_SOURCES) \ $(XEN_DRIVER_SOURCES) \ $(QEMU_DRIVER_SOURCES) \ diff --git a/src/test/Makefile.inc.am b/src/test/Makefile.inc.am new file mode 100644 index 0000000000..d52c281545 --- /dev/null +++ b/src/test/Makefile.inc.am @@ -0,0 +1,26 @@ +TEST_DRIVER_SOURCES =3D \ + test/test_driver.c \ + test/test_driver.h \ + $(NULL) +TEST_DRIVER_ASSETS =3D test/test-screenshot.png + +DRIVER_SOURCE_FILES +=3D $(TEST_DRIVER_SOURCES) + +EXTRA_DIST +=3D \ + $(TEST_DRIVER_SOURCES) \ + $(TEST_DRIVER_ASSETS) \ + $(NULL) + +if WITH_TEST + +driver_test_asset_DATA =3D $(TEST_DRIVER_ASSETS) +driver_test_assetdir =3D $(pkgdatadir) + +noinst_LTLIBRARIES +=3D libvirt_driver_test.la +libvirt_la_BUILT_LIBADD +=3D libvirt_driver_test.la +libvirt_driver_test_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_test_la_SOURCES =3D $(TEST_DRIVER_SOURCES) +endif WITH_TEST --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list