From nobody Sun Nov 16 07:41:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1599052370; cv=none; d=zohomail.com; s=zohoarc; b=B6M9sI8VVPrjTJtDuFGwmBkNF+fSwW9FYY4zXDnUjkBLwL/m2KWmc/OsLzodZuibeckX/XmeaoVS4Ep9izPR/sgXphao4cjZmt3tOO/rk2i0cnUCMAOJzY0IJB6GgHql/wX2NkGQXFayP2mT3XFKa3lm6a5YscP5SaI9QKlKNAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1599052370; h=Content-Type:Content-Transfer-Encoding:Cc: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=9rcNcfNmBvJj7xlxKdI/XhLpGCnWhWuk9deAUuTkng8=; b=mMXSgb5Mub1SBJeKsvHZTsvtsYKNE7wBu12feMZD4rM/IJtWXDSKKeRNn7eL56iVQFSfbSI1W8R/FgZutQG4tmICW21gbGCubmO3br11iUyhQFkn/vUMSabeUyYbSB9fC6FKw8fZFG5Dc1c4mOs393RBo5hlI9pv4XiMvEv9dY0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159905237087888.22220023911098; Wed, 2 Sep 2020 06:12:50 -0700 (PDT) Received: from localhost ([::1]:51794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kDSZF-0006nh-Ub for importer@patchew.org; Wed, 02 Sep 2020 09:12:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kDSMX-0006Iy-TA for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:41 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:21669 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kDSMS-000795-Pp for qemu-devel@nongnu.org; Wed, 02 Sep 2020 08:59:41 -0400 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-473-fAGMGxlZN06FMQs_Rqvo0w-1; Wed, 02 Sep 2020 08:59:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ED3C781F021 for ; Wed, 2 Sep 2020 12:59:26 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 037B076E01; Wed, 2 Sep 2020 12:59:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599051576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9rcNcfNmBvJj7xlxKdI/XhLpGCnWhWuk9deAUuTkng8=; b=L0uHdyki640XY13mLUWlNZmLWhQbXFdOmEJkICkBoAJ84yIuFMMfIbAzNSeRAxRLnlTTKL rcQ2aJfWPBWsPiO/DIaty5ItHxH7Pk9Is6Iq7trym07nLgXgqo7MkmlufxO60B2TqyTUNa 3MmytdIfo1DeZCr2O3ByhHjFRPGYD8g= X-MC-Unique: fAGMGxlZN06FMQs_Rqvo0w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 16/39] meson: convert the unit tests Date: Wed, 2 Sep 2020 08:58:54 -0400 Message-Id: <20200902125917.26021-17-pbonzini@redhat.com> In-Reply-To: <20200902125917.26021-1-pbonzini@redhat.com> References: <20200902125917.26021-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/02 02:33:32 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200828110734.1638685-7-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 256 +---------------------------------------- tests/meson.build | 176 +++++++++++++++++++++++++++- tests/test-qga.c | 2 +- 3 files changed, 179 insertions(+), 255 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 9c30949adf..ce0a9fd780 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -38,256 +38,20 @@ export SRC_PATH SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ $(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak))) =20 -check-unit-y +=3D tests/check-qdict$(EXESUF) -check-unit-y +=3D tests/check-block-qdict$(EXESUF) -check-unit-y +=3D tests/check-qnum$(EXESUF) -check-unit-y +=3D tests/check-qstring$(EXESUF) -check-unit-y +=3D tests/check-qlist$(EXESUF) -check-unit-y +=3D tests/check-qnull$(EXESUF) -check-unit-y +=3D tests/check-qobject$(EXESUF) -check-unit-y +=3D tests/check-qjson$(EXESUF) -check-unit-y +=3D tests/check-qlit$(EXESUF) -check-unit-y +=3D tests/test-qobject-output-visitor$(EXESUF) -check-unit-y +=3D tests/test-clone-visitor$(EXESUF) -check-unit-y +=3D tests/test-qobject-input-visitor$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-qmp-cmds$(EXESUF) -check-unit-y +=3D tests/test-string-input-visitor$(EXESUF) -check-unit-y +=3D tests/test-string-output-visitor$(EXESUF) -check-unit-y +=3D tests/test-qmp-event$(EXESUF) -check-unit-y +=3D tests/test-opts-visitor$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-coroutine$(EXESUF) -check-unit-y +=3D tests/test-visitor-serialization$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-iov$(EXESUF) -check-unit-y +=3D tests/test-bitmap$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-aio$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-aio-multithread$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-throttle$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-thread-pool$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-hbitmap$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-bdrv-drain$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-bdrv-graph-mod$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-blockjob$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-blockjob-txn$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-block-backend$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-block-iothread$(EXESUF) -ifeq ($(CONFIG_POSIX),y) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-image-locking$(EXESUF) -endif -check-unit-y +=3D tests/test-x86-cpuid$(EXESUF) -# all code tested by test-x86-cpuid is inside topology.h -ifeq ($(CONFIG_SOFTMMU),y) -check-unit-y +=3D tests/test-xbzrle$(EXESUF) -check-unit-$(CONFIG_POSIX) +=3D tests/test-vmstate$(EXESUF) -endif -check-unit-y +=3D tests/test-cutils$(EXESUF) -check-unit-y +=3D tests/test-shift128$(EXESUF) -check-unit-y +=3D tests/test-mul64$(EXESUF) -check-unit-y +=3D tests/test-int128$(EXESUF) -# all code tested by test-int128 is inside int128.h -check-unit-y +=3D tests/rcutorture$(EXESUF) -check-unit-y +=3D tests/test-rcu-list$(EXESUF) -check-unit-y +=3D tests/test-rcu-simpleq$(EXESUF) -check-unit-y +=3D tests/test-rcu-tailq$(EXESUF) -check-unit-y +=3D tests/test-rcu-slist$(EXESUF) -check-unit-y +=3D tests/test-qdist$(EXESUF) -check-unit-y +=3D tests/test-qht$(EXESUF) -check-unit-y +=3D tests/test-qht-par$(EXESUF) -check-unit-y +=3D tests/test-bitops$(EXESUF) -check-unit-y +=3D tests/test-bitcnt$(EXESUF) -check-unit-y +=3D tests/test-qgraph$(EXESUF) -check-unit-y +=3D tests/check-qom-interface$(EXESUF) -check-unit-y +=3D tests/check-qom-proplist$(EXESUF) -check-unit-y +=3D tests/test-qemu-opts$(EXESUF) -check-unit-y +=3D tests/test-keyval$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-write-threshold$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-hash$(EXESUF) check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-hash$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-hmac$(EXESUF) check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-hmac$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-cipher$(EXESUF) check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-cipher$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-secret$(EXESUF) -check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) +=3D tests/test-c= rypto-tlscredsx509$(EXESUF) -check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) +=3D tests/test-c= rypto-tlssession$(EXESUF) -ifndef CONFIG_TSAN -# Some tests: test-char, test-qdev-global-props, and test-qga, -# are not runnable under TSan due to a known issue. -# https://github.com/google/sanitizers/issues/1116 -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-char$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-qdev-global-props$(EXESUF) -ifeq ($(CONFIG_GUEST_AGENT),y) -check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) +=3D tests= /test-qga$(EXESUF) -endif -endif -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-timed-average$(EXESUF) -check-unit-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_INOTIFY1)) +=3D tests/te= st-util-filemonitor$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-util-sockets$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-authz-simple$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-authz-list$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-authz-listfile$(EXESUF) -check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_AUTH_PAM)) +=3D tests/test= -authz-pam$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-task$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-channel-socket$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-channel-file$(EXESUF) -check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) +=3D tests/test-i= o-channel-tls$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-channel-command$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-channel-buffer$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-base64$(EXESUF) -check-unit-$(call land,$(CONFIG_BLOCK),$(if $(CONFIG_NETTLE),y,$(CONFIG_GC= RYPT))) +=3D tests/test-crypto-pbkdf$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-ivgen$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-afsplit$(EXESUF) -check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_QEMU_PRIVATE_XTS)) +=3D te= sts/test-crypto-xts$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-block$(EXESUF) -check-unit-y +=3D tests/test-logging$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-bufferiszero$(EXESUF) -check-unit-y +=3D tests/test-uuid$(EXESUF) -check-unit-y +=3D tests/ptimer-test$(EXESUF) -check-unit-y +=3D tests/test-qapi-util$(EXESUF) -ifeq ($(CONFIG_BLOCK)$(CONFIG_REPLICATION)$(CONFIG_POSIX),yyy) -check-unit-y +=3D tests/test-replication$(EXESUF) -endif =20 QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest =20 - # Deps that are common to various different sets of tests below test-util-obj-y =3D libqemuutil.a -test-qom-obj-y =3D $(qom-obj-y) $(test-util-obj-y) -test-qapi-obj-y =3D $(test-qom-obj-y) tests/libtestqapi.a -benchmark-crypto-obj-$(CONFIG_BLOCK) =3D $(authz-obj-y) $(crypto-obj-y) $(= test-qom-obj-y) -test-crypto-obj-$(CONFIG_BLOCK) =3D $(authz-obj-y) $(crypto-obj-y) $(test-= qom-obj-y) -test-io-obj-$(CONFIG_BLOCK) =3D $(io-obj-y) $(test-crypto-obj-y) -test-authz-obj-$(CONFIG_BLOCK) =3D $(test-qom-obj-y) $(authz-obj-y) -test-block-obj-$(CONFIG_BLOCK) =3D $(block-obj-y) $(test-io-obj-y) tests/i= othread.o - -tests/check-qnum$(EXESUF): tests/check-qnum.o $(test-util-obj-y) -tests/check-qstring$(EXESUF): tests/check-qstring.o $(test-util-obj-y) -tests/check-qdict$(EXESUF): tests/check-qdict.o $(test-util-obj-y) -tests/check-block-qdict$(EXESUF): tests/check-block-qdict.o $(test-util-ob= j-y) -tests/check-qlist$(EXESUF): tests/check-qlist.o $(test-util-obj-y) -tests/check-qnull$(EXESUF): tests/check-qnull.o $(test-util-obj-y) -tests/check-qobject$(EXESUF): tests/check-qobject.o $(test-util-obj-y) -tests/check-qjson$(EXESUF): tests/check-qjson.o $(test-util-obj-y) -tests/check-qlit$(EXESUF): tests/check-qlit.o $(test-util-obj-y) -tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(test-qom= -obj-y) -tests/check-qom-proplist$(EXESUF): tests/check-qom-proplist.o $(test-qom-o= bj-y) - -tests/test-char$(EXESUF): tests/test-char.o $(test-util-obj-y) $(test-io-o= bj-y) $(chardev-obj-y) tests/socket-helpers.o -tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(test-block-obj-y) -tests/test-aio$(EXESUF): tests/test-aio.o $(test-block-obj-y) -tests/test-aio-multithread$(EXESUF): tests/test-aio-multithread.o $(test-b= lock-obj-y) -tests/test-throttle$(EXESUF): tests/test-throttle.o $(test-block-obj-y) -tests/test-bdrv-drain$(EXESUF): tests/test-bdrv-drain.o $(test-block-obj-y= ) $(test-util-obj-y) -tests/test-bdrv-graph-mod$(EXESUF): tests/test-bdrv-graph-mod.o $(test-blo= ck-obj-y) $(test-util-obj-y) -tests/test-blockjob$(EXESUF): tests/test-blockjob.o $(test-block-obj-y) $(= test-util-obj-y) -tests/test-blockjob-txn$(EXESUF): tests/test-blockjob-txn.o $(test-block-o= bj-y) $(test-util-obj-y) -tests/test-block-backend$(EXESUF): tests/test-block-backend.o $(test-block= -obj-y) $(test-util-obj-y) -tests/test-block-iothread$(EXESUF): tests/test-block-iothread.o $(test-blo= ck-obj-y) $(test-util-obj-y) -tests/test-image-locking$(EXESUF): tests/test-image-locking.o $(test-block= -obj-y) $(test-util-obj-y) -tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(test-block-obj= -y) -tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-obj-y) -tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y) $(tes= t-crypto-obj-y) -tests/test-bitmap$(EXESUF): tests/test-bitmap.o $(test-util-obj-y) -tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o -tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/libmigration.fa = $(test-util-obj-y) \ - $(test-io-obj-y) -tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o $(test-util-= obj-y) -tests/test-int128$(EXESUF): tests/test-int128.o -tests/rcutorture$(EXESUF): tests/rcutorture.o $(test-util-obj-y) -tests/test-rcu-list$(EXESUF): tests/test-rcu-list.o $(test-util-obj-y) -tests/test-rcu-simpleq$(EXESUF): tests/test-rcu-simpleq.o $(test-util-obj-= y) -tests/test-rcu-tailq$(EXESUF): tests/test-rcu-tailq.o $(test-util-obj-y) -tests/test-rcu-slist$(EXESUF): tests/test-rcu-slist.o $(test-util-obj-y) -tests/test-qdist$(EXESUF): tests/test-qdist.o $(test-util-obj-y) -tests/test-qht$(EXESUF): tests/test-qht.o $(test-util-obj-y) -tests/test-qht-par$(EXESUF): tests/test-qht-par.o tests/qht-bench$(EXESUF)= $(test-util-obj-y) -tests/test-bufferiszero$(EXESUF): tests/test-bufferiszero.o $(test-util-ob= j-y) tests/atomic_add-bench$(EXESUF): tests/atomic_add-bench.o $(test-util-obj-= y) tests/atomic64-bench$(EXESUF): tests/atomic64-bench.o $(test-util-obj-y) =20 -tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o hw/c= ore/libhwcore.fa \ - $(test-qapi-obj-y) -tests/test-vmstate$(EXESUF): tests/test-vmstate.o migration/libmigration.f= a \ - $(test-io-obj-y) -tests/test-timed-average$(EXESUF): tests/test-timed-average.o $(test-util-= obj-y) -tests/test-base64$(EXESUF): tests/test-base64.o $(test-util-obj-y) -tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o = hw/core/ptimer.o -tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y) -tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-= qapi-obj-y) -tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-b= lock-obj-y) -tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y) -tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y) - -tests/test-logging$(EXESUF): tests/test-logging.o $(test-util-obj-y) - -tests/test-replication$(EXESUF): tests/test-replication.o $(test-util-obj-= y) \ - $(test-block-obj-y) - -tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visito= r.o $(test-qapi-obj-y) -tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.= o $(test-qapi-obj-y) -tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) t= ests/test-qapi-emit-events.o tests/test-qapi-events.o -tests/test-qobject-output-visitor$(EXESUF): tests/test-qobject-output-visi= tor.o $(test-qapi-obj-y) -tests/test-clone-visitor$(EXESUF): tests/test-clone-visitor.o $(test-qapi-= obj-y) -tests/test-qobject-input-visitor$(EXESUF): tests/test-qobject-input-visito= r.o $(test-qapi-obj-y) -tests/test-qmp-cmds$(EXESUF): tests/test-qmp-cmds.o tests/test-qapi-comman= ds.o tests/test-qapi-init-commands.o $(test-qapi-obj-y) -tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serializatio= n.o $(test-qapi-obj-y) -tests/test-opts-visitor$(EXESUF): tests/test-opts-visitor.o $(test-qapi-ob= j-y) - -tests/test-shift128$(EXESUF): tests/test-shift128.o $(test-util-obj-y) -tests/test-mul64$(EXESUF): tests/test-mul64.o $(test-util-obj-y) -tests/test-bitops$(EXESUF): tests/test-bitops.o $(test-util-obj-y) -tests/test-bitcnt$(EXESUF): tests/test-bitcnt.o $(test-util-obj-y) -tests/test-qgraph$(EXESUF): tests/test-qgraph.o tests/qtest/libqos/qgraph.= o $(test-util-obj-y) -tests/test-crypto-hash$(EXESUF): tests/test-crypto-hash.o $(test-crypto-ob= j-y) tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test= -crypto-obj-y) -tests/test-crypto-hmac$(EXESUF): tests/test-crypto-hmac.o $(test-crypto-ob= j-y) tests/benchmark-crypto-hmac$(EXESUF): tests/benchmark-crypto-hmac.o $(test= -crypto-obj-y) -tests/test-crypto-cipher$(EXESUF): tests/test-crypto-cipher.o $(test-crypt= o-obj-y) tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark-crypto-cipher.o $(= test-crypto-obj-y) -tests/test-crypto-secret$(EXESUF): tests/test-crypto-secret.o $(test-crypt= o-obj-y) -tests/test-crypto-xts$(EXESUF): tests/test-crypto-xts.o $(test-crypto-obj-= y) - -ifeq ($(CONFIG_KEYUTILS),y) -tests/test-crypto-secret.o-libs :=3D -lkeyutils -endif - -tests/crypto-tls-x509-helpers.o-cflags :=3D $(TASN1_CFLAGS) -tests/crypto-tls-x509-helpers.o-libs :=3D $(TASN1_LIBS) -tests/pkix_asn1_tab.o-cflags :=3D $(TASN1_CFLAGS) - -tests/test-crypto-tlscredsx509.o-cflags :=3D $(TASN1_CFLAGS) -tests/test-crypto-tlscredsx509$(EXESUF): tests/test-crypto-tlscredsx509.o \ - tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o $(test-crypto-obj-y) - -tests/test-crypto-tlssession.o-cflags :=3D $(TASN1_CFLAGS) -tests/test-crypto-tlssession$(EXESUF): tests/test-crypto-tlssession.o \ - tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o \ - tests/crypto-tls-psk-helpers.o \ - $(test-crypto-obj-y) -tests/test-util-filemonitor$(EXESUF): tests/test-util-filemonitor.o \ - $(test-util-obj-y) -tests/test-util-sockets$(EXESUF): tests/test-util-sockets.o \ - tests/socket-helpers.o $(test-util-obj-y) -tests/test-authz-simple$(EXESUF): tests/test-authz-simple.o $(test-authz-o= bj-y) -tests/test-authz-list$(EXESUF): tests/test-authz-list.o $(test-authz-obj-y) -tests/test-authz-listfile$(EXESUF): tests/test-authz-listfile.o $(test-aut= hz-obj-y) -tests/test-authz-pam$(EXESUF): tests/test-authz-pam.o $(test-authz-obj-y) -tests/test-io-task$(EXESUF): tests/test-io-task.o $(test-io-obj-y) -tests/test-io-channel-socket$(EXESUF): tests/test-io-channel-socket.o \ - tests/io-channel-helpers.o tests/socket-helpers.o $(test-io-obj-y) -tests/test-io-channel-file$(EXESUF): tests/test-io-channel-file.o \ - tests/io-channel-helpers.o $(test-io-obj-y) -tests/test-io-channel-tls$(EXESUF): tests/test-io-channel-tls.o \ - tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o \ - tests/io-channel-helpers.o $(test-io-obj-y) -tests/test-io-channel-command$(EXESUF): tests/test-io-channel-command.o \ - tests/io-channel-helpers.o $(test-io-obj-y) -tests/test-io-channel-buffer$(EXESUF): tests/test-io-channel-buffer.o \ - tests/io-channel-helpers.o $(test-io-obj-y) -tests/test-crypto-pbkdf$(EXESUF): tests/test-crypto-pbkdf.o $(test-crypto-= obj-y) -tests/test-crypto-ivgen$(EXESUF): tests/test-crypto-ivgen.o $(test-crypto-= obj-y) -tests/test-crypto-afsplit$(EXESUF): tests/test-crypto-afsplit.o $(test-cry= pto-obj-y) -tests/test-crypto-block$(EXESUF): tests/test-crypto-block.o $(test-crypto-= obj-y) =20 tests/migration/stress$(EXESUF): tests/migration/stress.o $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"L= INK","$(TARGET_DIR)$@") @@ -301,8 +65,6 @@ tests/migration/initrd-stress.img: tests/migration/stres= s$(EXESUF) rm $(INITRD_WORK_DIR)/init rmdir $(INITRD_WORK_DIR) =20 -tests/test-qga$(EXESUF): qga/qemu-ga$(EXESUF) -tests/test-qga$(EXESUF): tests/test-qga.o tests/qtest/libqtest.o $(test-ut= il-obj-y) tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-ob= j-y) libvhost-user.a tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_s= cm_helper.o =20 @@ -343,19 +105,9 @@ define do_test_tap "TAP","$@") endef =20 -build-unit: $(check-unit-y) - -check-unit: $(check-unit-y) - $(call do_test_human, $^) - check-speed: $(check-speed-y) $(call do_test_human, $^) =20 -# gtester tests with TAP output - -check-report-unit.tap: $(check-unit-y) - $(call do_test_tap,$^) - # Per guest TCG tests =20 BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) @@ -448,7 +200,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-v= m-images =20 # Consolidated targets =20 -.PHONY: check-block check-unit check check-clean get-vm-images +.PHONY: check-block check check-clean get-vm-images check: =20 ifeq ($(CONFIG_TOOLS)$(CONFIG_POSIX),yy) @@ -460,14 +212,12 @@ check-block: $(SRC_PATH)/tests/check-block.sh qemu-im= g$(EXESUF) \ @$< endif =20 -check-build: build-unit $(QEMU_IOTESTS_HELPERS-y) +check-build: $(QEMU_IOTESTS_HELPERS-y) =20 check-clean: - rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) + rm -rf tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) =20 -check: check-unit - clean: check-clean =20 # Build the help program automatically diff --git a/tests/meson.build b/tests/meson.build index 3aeae23d54..bd5d13f6f9 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,5 +1,7 @@ +py3 =3D import('python').find_installation() + qht_bench =3D executable('qht-bench', - sources: files('qht-bench.c'), + sources: 'qht-bench.c', dependencies: [qemuutil]) =20 test_qapi_outputs =3D [ @@ -47,6 +49,178 @@ subdir('include') libtestqapi =3D static_library('testqapi', sources: [test_qapi_files, test= _qapi_outputs_extra]) testqapi =3D declare_dependency(link_with: libtestqapi) =20 +testblock =3D declare_dependency(dependencies: [block], sources: 'iothread= .c') + +tests =3D { + 'check-block-qdict': [], + 'check-qdict': [], + 'check-qnum': [], + 'check-qstring': [], + 'check-qlist': [], + 'check-qnull': [], + 'check-qobject': [], + 'check-qjson': [], + 'check-qlit': [], + 'test-qobject-output-visitor': [testqapi], + 'test-clone-visitor': [testqapi], + 'test-qobject-input-visitor': [testqapi], + 'test-string-input-visitor': [testqapi], + 'test-string-output-visitor': [testqapi], + 'test-qmp-event': [testqapi], + 'test-opts-visitor': [testqapi], + 'test-visitor-serialization': [testqapi], + 'test-bitmap': [], + # all code tested by test-x86-cpuid is inside topology.h + 'test-x86-cpuid': [], + 'test-cutils': [], + 'test-shift128': [], + 'test-mul64': [], + # all code tested by test-int128 is inside int128.h + 'test-int128': [], + 'rcutorture': [], + 'test-rcu-list': [], + 'test-rcu-simpleq': [], + 'test-rcu-tailq': [], + 'test-rcu-slist': [], + 'test-qdist': [], + 'test-qht': [], + 'test-bitops': [], + 'test-bitcnt': [], + 'test-qgraph': ['qtest/libqos/qgraph.c'], + 'check-qom-interface': [qom], + 'check-qom-proplist': [qom], + 'test-qemu-opts': [], + 'test-keyval': [testqapi], + 'test-logging': [], + 'test-uuid': [], + 'ptimer-test': ['ptimer-test-stubs.c', meson.source_root() / 'hw/core/pt= imer.c'], + 'test-qapi-util': [], +} + +if have_block + tests +=3D { + 'test-coroutine': [testblock], + 'test-aio': [testblock], + 'test-aio-multithread': [testblock], + 'test-throttle': [testblock], + 'test-thread-pool': [testblock], + 'test-hbitmap': [testblock], + 'test-bdrv-drain': [testblock], + 'test-bdrv-graph-mod': [testblock], + 'test-blockjob': [testblock], + 'test-blockjob-txn': [testblock], + 'test-block-backend': [testblock], + 'test-block-iothread': [testblock], + 'test-write-threshold': [testblock], + 'test-crypto-hash': [crypto], + 'test-crypto-hmac': [crypto], + 'test-crypto-cipher': [crypto], + 'test-crypto-secret': [crypto, keyutils], + 'test-authz-simple': [authz], + 'test-authz-list': [authz], + 'test-authz-listfile': [authz], + 'test-io-task': [testblock], + 'test-io-channel-socket': ['socket-helpers.c', 'io-channel-helpers.c',= io], + 'test-io-channel-file': ['io-channel-helpers.c', io], + 'test-io-channel-command': ['io-channel-helpers.c', io], + 'test-io-channel-buffer': ['io-channel-helpers.c', io], + 'test-crypto-ivgen': [io], + 'test-crypto-afsplit': [io], + 'test-crypto-block': [io], + } + if 'CONFIG_GNUTLS' in config_host and \ + 'CONFIG_TASN1' in config_host + tests +=3D { + 'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1= _tab.c', + tasn1, crypto], + 'test-crypto-tlssession': ['crypto-tls-x509-helpers.c', 'pkix_asn1_t= ab.c', 'crypto-tls-psk-helpers.c', + tasn1, crypto], + 'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-hel= pers.c', 'pkix_asn1_tab.c', + tasn1, io, crypto]} + endif + if 'CONFIG_AUTH_PAM' in config_host + tests +=3D {'test-authz-pam': [authz]} + endif + if 'CONFIG_QEMU_PRIVATE_XTS' in config_host + tests +=3D {'test-crypto-xts': [crypto, io]} + endif + if 'CONFIG_POSIX' in config_host + tests +=3D {'test-image-locking': [testblock]} + endif + if 'CONFIG_REPLICATION' in config_host and \ + 'CONFIG_POSIX' in config_host + tests +=3D {'test-replication': [testblock]} + endif + if 'CONFIG_NETTLE' in config_host or 'CONFIG_GCRYPT' in config_host + tests +=3D {'test-crypto-pbkdf': [io]} + endif +endif + +if have_system + tests +=3D { + 'test-iov': [], + 'test-qmp-cmds': [testqapi], + 'test-xbzrle': [migration], + 'test-vmstate': [migration, io], + 'test-timed-average': [], + 'test-util-filemonitor': [], + 'test-util-sockets': ['socket-helpers.c'], + 'test-base64': [], + 'test-bufferiszero': [], + } + if 'CONFIG_POSIX' in config_host + tests +=3D {'test-vmstate': [migration, io]} + endif + if 'CONFIG_INOTIFY1' in config_host + tests +=3D {'test-util-filemonitor': []} + endif + + # Some tests: test-char, test-qdev-global-props, and test-qga, + # are not runnable under TSan due to a known issue. + # https://github.com/google/sanitizers/issues/1116 + if 'CONFIG_TSAN' not in config_host + tests +=3D { + 'test-char': ['socket-helpers.c', qom, io, chardev], + 'test-qdev-global-props': [qom, hwcore, testqapi] + } + endif +endif + +if 'CONFIG_TSAN' not in config_host and \ + 'CONFIG_GUEST_AGENT' in config_host and \ + 'CONFIG_LINUX' in config_host + tests +=3D {'test-qga': ['qtest/libqtest.c']} +endif + +test_deps =3D { + 'test-qht-par': qht_bench, + 'test-qga': qga, +} + +test_env =3D environment() +test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) +test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) + +foreach test_name, extra: tests + src =3D [test_name + '.c'] + deps =3D [qemuutil] + if extra.length() > 0 + # use a sourceset to quickly separate sources and deps + test_ss =3D ss.source_set() + test_ss.add(extra) + src +=3D test_ss.all_sources() + deps +=3D test_ss.all_dependencies() + endif + exe =3D executable(test_name, src, dependencies: deps) + + test(test_name, exe, + depends: test_deps.get(test_name, []), + env: test_env, + args: ['--tap', '-k'], + protocol: 'tap', + suite: ['unit']) +endforeach + if have_system and 'CONFIG_POSIX' in config_host subdir('qemu-iotests') endif diff --git a/tests/test-qga.c b/tests/test-qga.c index 122730d326..1e223e992c 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -4,7 +4,7 @@ #include #include =20 -#include "libqos/libqtest.h" +#include "qtest/libqos/libqtest.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" =20 --=20 2.26.2