From nobody Sun Feb 8 05:42:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1594894866; cv=none; d=zohomail.com; s=zohoarc; b=IHF4e7w3Zqe5DJoZVyGIimdFRpsqU5RVuVyoTgp2Gcmhp5W5wrrEAfyi/gfvQe0JR+jY2dpi2liHBmopMHtOuEH5RtDiJTY0F/3/N+OWt5lrHKhgT/gIBIVNrkTDLVkO0ytZxjEmXh31QAlTFTbOhhW2tzpDiQTKH5XNHWPFkR4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1594894866; 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; bh=ZKI7P0torD234DxmkPIiOY8mHyeZy8QTDfd668v+uUQ=; b=lxIjVfT2tvIcp9c9aoEwGLp1EN8V15JGi3nE/CDeCfDu8HI7nrMyxJuiHQJ7NXdTIyEVo6HdNo/VoNX8Jt8kwd08lK+7ZDKq2WkuNv4KhyVf0kWTOl949GImNyIBioWgSqcQZi/WrUXP+T1helkGuALtuKQ/DGRUTJYeT78H/rY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1594894866578306.95351828591185; Thu, 16 Jul 2020 03:21:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-19-w7FeabbzNfmuMwP-psxcLA-1; Thu, 16 Jul 2020 06:10:57 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0DFB91888AA2; Thu, 16 Jul 2020 10:10:52 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E09B96FED1; Thu, 16 Jul 2020 10:10:51 +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 B1B751804769; Thu, 16 Jul 2020 10:10:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 06GA71dA020126 for ; Thu, 16 Jul 2020 06:07:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id D10502B6DC; Thu, 16 Jul 2020 10:07:01 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.40.194.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4AE522B6DB for ; Thu, 16 Jul 2020 10:07:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1594894865; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZKI7P0torD234DxmkPIiOY8mHyeZy8QTDfd668v+uUQ=; b=IdspBmZu5CzYKuHGZ3EHYOJQWLY+4oYn5qyuaIW7mXkfJAWnfAgqwOnK3h49E6MsAgQwgu 5y3gmsH6kS5i4/OIyNcHJ17aTovofxBztK+EqHtbTzLG3gFaWbaPX829Eu6aYbd+0VoFIh N1IPiXchyMa/XgD7HiIDngRjtwLv3oc= X-MC-Unique: w7FeabbzNfmuMwP-psxcLA-1 From: Pavel Hrdina To: libvir-list@redhat.com Subject: [libvirt PATCH 299/351] meson: tests: add qemu specific tests Date: Thu, 16 Jul 2020 11:58:55 +0200 Message-Id: <082f84b8b74be0dc3f8d4d10f381daa766fea650.1594891445.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- tests/Makefile.am | 138 ---------------------------------------------- tests/meson.build | 21 +++++++ 2 files changed, 21 insertions(+), 138 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9e436512fef..a821b0e0af7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -38,18 +38,6 @@ endif WITH_ATTR endif WITH_SECDRIVER_SELINUX =20 if WITH_QEMU -test_programs +=3D qemuxml2argvtest qemuxml2xmltest \ - qemudomaincheckpointxml2xmltest qemudomainsnapshotxml2xmltest \ - qemumonitorjsontest qemuhotplugtest \ - qemuagenttest qemucapabilitiestest qemucaps2xmltest \ - qemumemlocktest \ - qemucommandutiltest \ - qemublocktest \ - qemumigparamstest \ - qemusecuritytest \ - qemufirmwaretest \ - qemuvhostusertest \ - $(NULL) test_helpers +=3D qemucapsprobe endif WITH_QEMU =20 @@ -148,136 +136,10 @@ valgrind: $(MAKE) check VG=3D"$(LIBTOOL) --mode=3Dexecute $(VALGRIND)" =20 if WITH_QEMU - -qemu_LDADDS =3D ../src/libvirt_driver_qemu_impl.la -if WITH_DTRACE_PROBES -qemu_LDADDS +=3D ../src/libvirt_qemu_probes.lo -endif WITH_DTRACE_PROBES -qemu_LDADDS +=3D $(LDADDS) - -qemuxml2argvtest_SOURCES =3D \ - qemuxml2argvtest.c testutilsqemu.c testutilsqemu.h \ - testutils.c testutils.h \ - virfilewrapper.c virfilewrapper.h \ - $(NULL) -qemuxml2argvtest_LDADD =3D libqemutestdriver.la libqemumonitortestutils.la= \ - $(LDADDS) $(LIBXML_LIBS) - -qemuxml2xmltest_SOURCES =3D \ - qemuxml2xmltest.c testutilsqemu.c testutilsqemu.h \ - testutils.c testutils.h \ - virfilewrapper.c virfilewrapper.h -qemuxml2xmltest_LDADD =3D $(qemu_LDADDS) - -qemumonitorjsontest_SOURCES =3D \ - qemumonitorjsontest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemumonitorjsontest_LDADD =3D libqemumonitortestutils.la \ - $(qemu_LDADDS) - -qemucapabilitiestest_SOURCES =3D \ - qemucapabilitiestest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemucapabilitiestest_LDADD =3D libqemumonitortestutils.la \ - $(qemu_LDADDS) - qemucapsprobe_SOURCES =3D \ qemucapsprobe.c qemucapsprobe_LDADD =3D \ libqemutestdriver.la $(LDADDS) - -qemucommandutiltest_SOURCES =3D \ - qemucommandutiltest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemucommandutiltest_LDADD =3D libqemumonitortestutils.la \ - $(qemu_LDADDS) - -qemucaps2xmltest_SOURCES =3D \ - qemucaps2xmltest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemucaps2xmltest_LDADD =3D $(qemu_LDADDS) - -qemuagenttest_SOURCES =3D \ - qemuagenttest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemuagenttest_LDADD =3D libqemumonitortestutils.la $(qemu_LDADDS) - -qemuhotplugtest_SOURCES =3D \ - qemuhotplugtest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemuhotplugtest_LDADD =3D \ - libqemutestdriver.la \ - libqemumonitortestutils.la \ - $(qemu_LDADDS) \ - $(NULL) - -qemublocktest_SOURCES =3D \ - qemublocktest.c \ - testutils.h testutils.c \ - testutilsqemu.h testutilsqemu.c \ - $(NULL) -qemublocktest_LDADD =3D \ - libqemumonitortestutils.la \ - ../src/libvirt.la \ - $(qemu_LDADDS) \ - $(NULL) - -qemudomaincheckpointxml2xmltest_SOURCES =3D \ - qemudomaincheckpointxml2xmltest.c testutilsqemu.c testutilsqemu.h \ - testutils.c testutils.h -qemudomaincheckpointxml2xmltest_LDADD =3D $(qemu_LDADDS) - -qemudomainsnapshotxml2xmltest_SOURCES =3D \ - qemudomainsnapshotxml2xmltest.c testutilsqemu.c testutilsqemu.h \ - testutils.c testutils.h -qemudomainsnapshotxml2xmltest_LDADD =3D $(qemu_LDADDS) - -qemumemlocktest_SOURCES =3D \ - qemumemlocktest.c \ - testutilsqemu.c testutilsqemu.h \ - testutils.c testutils.h -qemumemlocktest_LDADD =3D $(qemu_LDADDS) - -qemumigparamstest_SOURCES =3D \ - qemumigparamstest.c \ - testutils.c testutils.h \ - testutilsqemu.c testutilsqemu.h \ - $(NULL) -qemumigparamstest_LDADD =3D libqemumonitortestutils.la \ - $(qemu_LDADDS) - -qemusecuritytest_SOURCES =3D \ - qemusecuritytest.c qemusecuritytest.h \ - qemusecuritymock.c \ - testutils.h testutils.c \ - testutilsqemu.h testutilsqemu.c -qemusecuritytest_LDADD =3D $(qemu_LDADDS) - -qemufirmwaretest_SOURCES =3D \ - qemufirmwaretest.c \ - testutils.h testutils.c \ - virfilewrapper.c virfilewrapper.h \ - $(NULL) -qemufirmwaretest_LDADD =3D $(qemu_LDADDS) - -qemuvhostusertest_SOURCES =3D \ - qemuvhostusertest.c \ - testutils.h testutils.c \ - virfilewrapper.c virfilewrapper.h \ - $(NULL) -qemuvhostusertest_LDADD =3D $(qemu_LDADDS) endif ! WITH_QEMU =20 if WITH_VBOX diff --git a/tests/meson.build b/tests/meson.build index 6dd926e96b8..7a96d11e842 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -430,6 +430,27 @@ if conf.has('WITH_OPENVZ') ] endif =20 +if conf.has('WITH_QEMU') + tests +=3D [ + { 'name': 'qemuagenttest', 'link_with': [ test_utils_qemu_lib, test_qe= mu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemublocktest', 'link_with': [ test_utils_qemu_lib, test_qe= mu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemucapabilitiestest', 'link_with': [ test_utils_qemu_lib, = test_qemu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemucaps2xmltest', 'link_with': [ test_utils_qemu_lib, test= _qemu_driver_lib ] }, + { 'name': 'qemucommandutiltest', 'link_with': [ test_utils_qemu_lib, t= est_qemu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemudomaincheckpointxml2xmltest', 'link_with': [ test_utils= _qemu_lib, test_qemu_driver_lib ] }, + { 'name': 'qemudomainsnapshotxml2xmltest', 'link_with': [ test_utils_q= emu_lib, test_qemu_driver_lib ] }, + { 'name': 'qemufirmwaretest', 'link_with': [ test_qemu_driver_lib, tes= t_file_wrapper_lib ] }, + { 'name': 'qemuhotplugtest', 'link_with': [ test_utils_qemu_lib, test_= qemu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemumemlocktest', 'link_with': [ test_utils_qemu_lib, test_= qemu_driver_lib ] }, + { 'name': 'qemumigparamstest', 'link_with': [ test_utils_qemu_lib, tes= t_qemu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemumonitorjsontest', 'link_with': [ test_utils_qemu_lib, t= est_qemu_driver_lib, test_utils_qemu_monitor_lib ] }, + { 'name': 'qemusecuritytest', 'sources': [ 'qemusecuritytest.c', 'qemu= securitymock.c' ], 'link_with': [ test_utils_qemu_lib, test_qemu_driver_lib= ] }, + { 'name': 'qemuvhostusertest', 'link_with': [ test_qemu_driver_lib, te= st_file_wrapper_lib ] }, + { 'name': 'qemuxml2argvtest', 'link_with': [ test_utils_qemu_lib, test= _qemu_driver_lib, test_utils_qemu_monitor_lib, test_file_wrapper_lib ] }, + { 'name': 'qemuxml2xmltest', 'link_with': [ test_utils_qemu_lib, test_= qemu_driver_lib, test_file_wrapper_lib ] }, + ] +endif + foreach data : tests test_sources =3D '@0@.c'.format(data['name']) test_bin =3D executable( --=20 2.26.2