From nobody Sun May 19 03:12:48 2024 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=1615573164; cv=none; d=zohomail.com; s=zohoarc; b=PW8Do3i342vyabOw5lscwkjtrI719y5doyRir8iDazZMmY9XS+eMrN4yFYpFxogH2E/vsKAbMCh9192Q0N725hLLh8cUeJlQiBmfZk+Jmd9lXDsl/8oVaxwYH+s3/rspOC4MyR6s/0FJU6f8rbVaKn0gtcrxMh+ooyyA0FmblDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615573164; 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=s2Zx8wUOM1vg07TLznlF4gVeNMs8f/3T+XnOIogA2lc=; b=JbjZmnZlNwL0KlSDz0VHqXk7uqxJoD1gchH1KCBECZVJSe2pXRH1xDT1+uL1E1SD/zaHtbj2+33swWaUCwxxR0Gsvs+4RfkRfMx208TmaXKkwyjaLdmBLBt7AJwNu+8X21p++oe2W5XKewvfm/VxZOv+HSJ0V+W1RMs28GBgX6E= 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 1615573163997932.1397513081096; Fri, 12 Mar 2021 10:19:23 -0800 (PST) Received: from localhost ([::1]:44900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKmNe-00079n-1l for importer@patchew.org; Fri, 12 Mar 2021 13:19:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58288) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKlWN-0007gv-5E for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:19 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:37166) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKlWG-0000hO-WD for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:18 -0500 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-40-Z14HnrxMOKy48Vz1l9GFnA-1; Fri, 12 Mar 2021 12:24:02 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6E409100C664; Fri, 12 Mar 2021 17:24:01 +0000 (UTC) Received: from thuth.com (ovpn-112-83.ams2.redhat.com [10.36.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A71E19744; Fri, 12 Mar 2021 17:23:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615569851; 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=s2Zx8wUOM1vg07TLznlF4gVeNMs8f/3T+XnOIogA2lc=; b=C2u+eG9PuvMkqwHAePaSf5xxBEm0iFn5Gm4RnL3iEN+2JTFnipNEsOJlm5rTKg3/seVgJE Himc9V6vx1IeQubZfx4FaVGUf/1q4rSLF4ZdfKhu4NljnfxHKaztOka5LVbTq8cdTYeJ/m 7XsmB9wEP3HbcAfclllQ5i+6fiPU5Sk= X-MC-Unique: Z14HnrxMOKy48Vz1l9GFnA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 1/9] tests: Move unit tests into a separate directory Date: Fri, 12 Mar 2021 18:23:48 +0100 Message-Id: <20210312172356.968219-2-thuth@redhat.com> In-Reply-To: <20210312172356.968219-1-thuth@redhat.com> References: <20210312172356.968219-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The main tests directory still looks very crowded, and it's not clear which files are part of a unit tests and which belong to a different test subsystem. Let's clean up the mess and move the unit tests to a separate directory. Message-Id: <20210310063314.1049838-1-thuth@redhat.com> Acked-by: Paolo Bonzini Signed-off-by: Thomas Huth --- MAINTAINERS | 68 +++---- tests/meson.build | 182 +---------------- tests/{ =3D> unit}/check-block-qdict.c | 0 tests/{ =3D> unit}/check-qdict.c | 0 tests/{ =3D> unit}/check-qjson.c | 0 tests/{ =3D> unit}/check-qlist.c | 0 tests/{ =3D> unit}/check-qlit.c | 0 tests/{ =3D> unit}/check-qnull.c | 0 tests/{ =3D> unit}/check-qnum.c | 0 tests/{ =3D> unit}/check-qobject.c | 0 tests/{ =3D> unit}/check-qom-interface.c | 0 tests/{ =3D> unit}/check-qom-proplist.c | 0 tests/{ =3D> unit}/check-qstring.c | 0 tests/{ =3D> unit}/crypto-tls-psk-helpers.c | 0 tests/{ =3D> unit}/crypto-tls-psk-helpers.h | 0 tests/{ =3D> unit}/crypto-tls-x509-helpers.c | 0 tests/{ =3D> unit}/crypto-tls-x509-helpers.h | 0 tests/{ =3D> unit}/io-channel-helpers.c | 0 tests/{ =3D> unit}/io-channel-helpers.h | 0 tests/{ =3D> unit}/iothread.c | 0 tests/{ =3D> unit}/iothread.h | 0 tests/unit/meson.build | 184 ++++++++++++++++++ tests/{ =3D> unit}/pkix_asn1_tab.c | 2 +- tests/{ =3D> unit}/ptimer-test-stubs.c | 0 tests/{ =3D> unit}/ptimer-test.c | 0 tests/{ =3D> unit}/ptimer-test.h | 0 tests/{ =3D> unit}/rcutorture.c | 0 tests/{ =3D> unit}/socket-helpers.c | 0 tests/{ =3D> unit}/socket-helpers.h | 0 tests/{ =3D> unit}/test-aio-multithread.c | 0 tests/{ =3D> unit}/test-aio.c | 0 tests/{ =3D> unit}/test-authz-list.c | 0 tests/{ =3D> unit}/test-authz-listfile.c | 0 tests/{ =3D> unit}/test-authz-pam.c | 0 tests/{ =3D> unit}/test-authz-simple.c | 0 tests/{ =3D> unit}/test-base64.c | 0 tests/{ =3D> unit}/test-bdrv-drain.c | 0 tests/{ =3D> unit}/test-bdrv-graph-mod.c | 0 tests/{ =3D> unit}/test-bitcnt.c | 0 tests/{ =3D> unit}/test-bitmap.c | 0 tests/{ =3D> unit}/test-bitops.c | 0 tests/{ =3D> unit}/test-block-backend.c | 0 tests/{ =3D> unit}/test-block-iothread.c | 0 tests/{ =3D> unit}/test-blockjob-txn.c | 0 tests/{ =3D> unit}/test-blockjob.c | 0 tests/{ =3D> unit}/test-bufferiszero.c | 0 tests/{ =3D> unit}/test-char.c | 0 tests/{ =3D> unit}/test-clone-visitor.c | 0 tests/{ =3D> unit}/test-coroutine.c | 0 tests/{ =3D> unit}/test-crypto-afsplit.c | 0 tests/{ =3D> unit}/test-crypto-block.c | 0 tests/{ =3D> unit}/test-crypto-cipher.c | 0 tests/{ =3D> unit}/test-crypto-hash.c | 0 tests/{ =3D> unit}/test-crypto-hmac.c | 0 tests/{ =3D> unit}/test-crypto-ivgen.c | 0 tests/{ =3D> unit}/test-crypto-pbkdf.c | 0 tests/{ =3D> unit}/test-crypto-secret.c | 0 tests/{ =3D> unit}/test-crypto-tlscredsx509.c | 0 tests/{ =3D> unit}/test-crypto-tlssession.c | 0 tests/{ =3D> unit}/test-crypto-xts.c | 0 tests/{ =3D> unit}/test-cutils.c | 0 tests/{ =3D> unit}/test-fdmon-epoll.c | 0 tests/{ =3D> unit}/test-hbitmap.c | 0 tests/{ =3D> unit}/test-image-locking.c | 0 tests/{ =3D> unit}/test-int128.c | 0 tests/{ =3D> unit}/test-io-channel-buffer.c | 0 tests/{ =3D> unit}/test-io-channel-command.c | 0 tests/{ =3D> unit}/test-io-channel-file.c | 0 tests/{ =3D> unit}/test-io-channel-socket.c | 0 tests/{ =3D> unit}/test-io-channel-tls.c | 0 tests/{ =3D> unit}/test-io-task.c | 0 tests/{ =3D> unit}/test-iov.c | 0 tests/{ =3D> unit}/test-keyval.c | 0 tests/{ =3D> unit}/test-logging.c | 0 tests/{ =3D> unit}/test-mul64.c | 0 tests/{ =3D> unit}/test-opts-visitor.c | 0 tests/{ =3D> unit}/test-qapi-util.c | 0 tests/{ =3D> unit}/test-qdev-global-props.c | 0 tests/{ =3D> unit}/test-qdist.c | 0 tests/{ =3D> unit}/test-qemu-opts.c | 0 tests/{ =3D> unit}/test-qga.c | 2 +- tests/{ =3D> unit}/test-qgraph.c | 4 +- tests/{ =3D> unit}/test-qht.c | 0 tests/{ =3D> unit}/test-qmp-cmds.c | 0 tests/{ =3D> unit}/test-qmp-event.c | 0 tests/{ =3D> unit}/test-qobject-input-visitor.c | 0 .../{ =3D> unit}/test-qobject-output-visitor.c | 0 tests/{ =3D> unit}/test-rcu-list.c | 0 tests/{ =3D> unit}/test-rcu-simpleq.c | 0 tests/{ =3D> unit}/test-rcu-slist.c | 0 tests/{ =3D> unit}/test-rcu-tailq.c | 0 tests/{ =3D> unit}/test-replication.c | 0 tests/{ =3D> unit}/test-shift128.c | 0 tests/{ =3D> unit}/test-string-input-visitor.c | 0 tests/{ =3D> unit}/test-string-output-visitor.c | 0 tests/{ =3D> unit}/test-thread-pool.c | 0 tests/{ =3D> unit}/test-throttle.c | 0 tests/{ =3D> unit}/test-timed-average.c | 0 tests/{ =3D> unit}/test-util-filemonitor.c | 0 tests/{ =3D> unit}/test-util-sockets.c | 0 tests/{ =3D> unit}/test-uuid.c | 0 tests/{ =3D> unit}/test-visitor-serialization.c | 0 tests/{ =3D> unit}/test-vmstate.c | 0 tests/{ =3D> unit}/test-write-threshold.c | 0 tests/{ =3D> unit}/test-x86-cpuid.c | 0 tests/{ =3D> unit}/test-xbzrle.c | 0 106 files changed, 223 insertions(+), 219 deletions(-) rename tests/{ =3D> unit}/check-block-qdict.c (100%) rename tests/{ =3D> unit}/check-qdict.c (100%) rename tests/{ =3D> unit}/check-qjson.c (100%) rename tests/{ =3D> unit}/check-qlist.c (100%) rename tests/{ =3D> unit}/check-qlit.c (100%) rename tests/{ =3D> unit}/check-qnull.c (100%) rename tests/{ =3D> unit}/check-qnum.c (100%) rename tests/{ =3D> unit}/check-qobject.c (100%) rename tests/{ =3D> unit}/check-qom-interface.c (100%) rename tests/{ =3D> unit}/check-qom-proplist.c (100%) rename tests/{ =3D> unit}/check-qstring.c (100%) rename tests/{ =3D> unit}/crypto-tls-psk-helpers.c (100%) rename tests/{ =3D> unit}/crypto-tls-psk-helpers.h (100%) rename tests/{ =3D> unit}/crypto-tls-x509-helpers.c (100%) rename tests/{ =3D> unit}/crypto-tls-x509-helpers.h (100%) rename tests/{ =3D> unit}/io-channel-helpers.c (100%) rename tests/{ =3D> unit}/io-channel-helpers.h (100%) rename tests/{ =3D> unit}/iothread.c (100%) rename tests/{ =3D> unit}/iothread.h (100%) create mode 100644 tests/unit/meson.build rename tests/{ =3D> unit}/pkix_asn1_tab.c (99%) rename tests/{ =3D> unit}/ptimer-test-stubs.c (100%) rename tests/{ =3D> unit}/ptimer-test.c (100%) rename tests/{ =3D> unit}/ptimer-test.h (100%) rename tests/{ =3D> unit}/rcutorture.c (100%) rename tests/{ =3D> unit}/socket-helpers.c (100%) rename tests/{ =3D> unit}/socket-helpers.h (100%) rename tests/{ =3D> unit}/test-aio-multithread.c (100%) rename tests/{ =3D> unit}/test-aio.c (100%) rename tests/{ =3D> unit}/test-authz-list.c (100%) rename tests/{ =3D> unit}/test-authz-listfile.c (100%) rename tests/{ =3D> unit}/test-authz-pam.c (100%) rename tests/{ =3D> unit}/test-authz-simple.c (100%) rename tests/{ =3D> unit}/test-base64.c (100%) rename tests/{ =3D> unit}/test-bdrv-drain.c (100%) rename tests/{ =3D> unit}/test-bdrv-graph-mod.c (100%) rename tests/{ =3D> unit}/test-bitcnt.c (100%) rename tests/{ =3D> unit}/test-bitmap.c (100%) rename tests/{ =3D> unit}/test-bitops.c (100%) rename tests/{ =3D> unit}/test-block-backend.c (100%) rename tests/{ =3D> unit}/test-block-iothread.c (100%) rename tests/{ =3D> unit}/test-blockjob-txn.c (100%) rename tests/{ =3D> unit}/test-blockjob.c (100%) rename tests/{ =3D> unit}/test-bufferiszero.c (100%) rename tests/{ =3D> unit}/test-char.c (100%) rename tests/{ =3D> unit}/test-clone-visitor.c (100%) rename tests/{ =3D> unit}/test-coroutine.c (100%) rename tests/{ =3D> unit}/test-crypto-afsplit.c (100%) rename tests/{ =3D> unit}/test-crypto-block.c (100%) rename tests/{ =3D> unit}/test-crypto-cipher.c (100%) rename tests/{ =3D> unit}/test-crypto-hash.c (100%) rename tests/{ =3D> unit}/test-crypto-hmac.c (100%) rename tests/{ =3D> unit}/test-crypto-ivgen.c (100%) rename tests/{ =3D> unit}/test-crypto-pbkdf.c (100%) rename tests/{ =3D> unit}/test-crypto-secret.c (100%) rename tests/{ =3D> unit}/test-crypto-tlscredsx509.c (100%) rename tests/{ =3D> unit}/test-crypto-tlssession.c (100%) rename tests/{ =3D> unit}/test-crypto-xts.c (100%) rename tests/{ =3D> unit}/test-cutils.c (100%) rename tests/{ =3D> unit}/test-fdmon-epoll.c (100%) rename tests/{ =3D> unit}/test-hbitmap.c (100%) rename tests/{ =3D> unit}/test-image-locking.c (100%) rename tests/{ =3D> unit}/test-int128.c (100%) rename tests/{ =3D> unit}/test-io-channel-buffer.c (100%) rename tests/{ =3D> unit}/test-io-channel-command.c (100%) rename tests/{ =3D> unit}/test-io-channel-file.c (100%) rename tests/{ =3D> unit}/test-io-channel-socket.c (100%) rename tests/{ =3D> unit}/test-io-channel-tls.c (100%) rename tests/{ =3D> unit}/test-io-task.c (100%) rename tests/{ =3D> unit}/test-iov.c (100%) rename tests/{ =3D> unit}/test-keyval.c (100%) rename tests/{ =3D> unit}/test-logging.c (100%) rename tests/{ =3D> unit}/test-mul64.c (100%) rename tests/{ =3D> unit}/test-opts-visitor.c (100%) rename tests/{ =3D> unit}/test-qapi-util.c (100%) rename tests/{ =3D> unit}/test-qdev-global-props.c (100%) rename tests/{ =3D> unit}/test-qdist.c (100%) rename tests/{ =3D> unit}/test-qemu-opts.c (100%) rename tests/{ =3D> unit}/test-qga.c (99%) rename tests/{ =3D> unit}/test-qgraph.c (99%) rename tests/{ =3D> unit}/test-qht.c (100%) rename tests/{ =3D> unit}/test-qmp-cmds.c (100%) rename tests/{ =3D> unit}/test-qmp-event.c (100%) rename tests/{ =3D> unit}/test-qobject-input-visitor.c (100%) rename tests/{ =3D> unit}/test-qobject-output-visitor.c (100%) rename tests/{ =3D> unit}/test-rcu-list.c (100%) rename tests/{ =3D> unit}/test-rcu-simpleq.c (100%) rename tests/{ =3D> unit}/test-rcu-slist.c (100%) rename tests/{ =3D> unit}/test-rcu-tailq.c (100%) rename tests/{ =3D> unit}/test-replication.c (100%) rename tests/{ =3D> unit}/test-shift128.c (100%) rename tests/{ =3D> unit}/test-string-input-visitor.c (100%) rename tests/{ =3D> unit}/test-string-output-visitor.c (100%) rename tests/{ =3D> unit}/test-thread-pool.c (100%) rename tests/{ =3D> unit}/test-throttle.c (100%) rename tests/{ =3D> unit}/test-timed-average.c (100%) rename tests/{ =3D> unit}/test-util-filemonitor.c (100%) rename tests/{ =3D> unit}/test-util-sockets.c (100%) rename tests/{ =3D> unit}/test-uuid.c (100%) rename tests/{ =3D> unit}/test-visitor-serialization.c (100%) rename tests/{ =3D> unit}/test-vmstate.c (100%) rename tests/{ =3D> unit}/test-write-threshold.c (100%) rename tests/{ =3D> unit}/test-x86-cpuid.c (100%) rename tests/{ =3D> unit}/test-xbzrle.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index e04ae21a2f..e6c43c6833 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1537,7 +1537,7 @@ F: include/hw/southbridge/piix.h F: hw/misc/sga.c F: hw/isa/apm.c F: include/hw/isa/apm.h -F: tests/test-x86-cpuid.c +F: tests/unit/test-x86-cpuid.c F: tests/qtest/test-x86-cpuid-compat.c =20 PC Chipset @@ -2212,7 +2212,7 @@ F: qemu-io* F: tests/qemu-iotests/ F: util/qemu-progress.c F: qobject/block-qdict.c -F: tests/check-block-qdict.c +F: tests/unit/check-block-qdict.c T: git https://repo.or.cz/qemu/kevin.git block =20 Storage daemon @@ -2238,7 +2238,7 @@ F: migration/block* F: include/block/aio.h F: include/block/aio-wait.h F: scripts/qemugdb/aio.py -F: tests/test-fdmon-epoll.c +F: tests/unit/test-fdmon-epoll.c T: git https://github.com/stefanha/qemu.git block =20 Block SCSI subsystem @@ -2298,7 +2298,7 @@ F: block/dirty-bitmap.c F: block/qcow2-bitmap.c F: migration/block-dirty-bitmap.c F: util/hbitmap.c -F: tests/test-hbitmap.c +F: tests/unit/test-hbitmap.c F: docs/interop/bitmaps.rst T: git https://repo.or.cz/qemu/ericb.git bitmaps =20 @@ -2319,8 +2319,8 @@ Command line option argument parsing M: Markus Armbruster S: Supported F: include/qemu/option.h -F: tests/test-keyval.c -F: tests/test-qemu-opts.c +F: tests/unit/test-keyval.c +F: tests/unit/test-qemu-opts.c F: util/keyval.c F: util/qemu-option.c =20 @@ -2438,8 +2438,8 @@ Read, Copy, Update (RCU) M: Paolo Bonzini S: Maintained F: include/qemu/rcu*.h -F: tests/rcutorture.c -F: tests/test-rcu-*.c +F: tests/unit/rcutorture.c +F: tests/unit/test-rcu-*.c F: util/rcu.c =20 Human Monitor (HMP) @@ -2517,10 +2517,10 @@ F: include/qapi/ X: include/qapi/qmp/ F: include/qapi/qmp/dispatch.h F: tests/qapi-schema/ -F: tests/test-*-visitor.c -F: tests/test-qapi-*.c -F: tests/test-qmp-*.c -F: tests/test-visitor-serialization.c +F: tests/unit/test-*-visitor.c +F: tests/unit/test-qapi-*.c +F: tests/unit/test-qmp-*.c +F: tests/unit/test-visitor-serialization.c F: scripts/qapi-gen.py F: scripts/qapi/* F: docs/sphinx/qapidoc.py @@ -2541,14 +2541,14 @@ F: qobject/ F: include/qapi/qmp/ X: include/qapi/qmp/dispatch.h F: scripts/coccinelle/qobject.cocci -F: tests/check-qdict.c -F: tests/check-qjson.c -F: tests/check-qlist.c -F: tests/check-qlit.c -F: tests/check-qnull.c -F: tests/check-qnum.c -F: tests/check-qobject.c -F: tests/check-qstring.c +F: tests/unit/check-qdict.c +F: tests/unit/check-qjson.c +F: tests/unit/check-qlist.c +F: tests/unit/check-qlit.c +F: tests/unit/check-qnull.c +F: tests/unit/check-qnum.c +F: tests/unit/check-qobject.c +F: tests/unit/check-qstring.c F: tests/data/qobject/qdict.txt T: git https://repo.or.cz/qemu/armbru.git qapi-next =20 @@ -2559,7 +2559,7 @@ F: qga/ F: docs/interop/qemu-ga.rst F: docs/interop/qemu-ga-ref.rst F: scripts/qemu-guest-agent/ -F: tests/test-qga.c +F: tests/unit/test-qga.c T: git https://github.com/mdroth/qemu.git qga =20 QOM @@ -2580,9 +2580,9 @@ F: scripts/coccinelle/qom-parent-type.cocci F: softmmu/qdev-monitor.c F: stubs/qdev.c F: qom/ -F: tests/check-qom-interface.c -F: tests/check-qom-proplist.c -F: tests/test-qdev-global-props.c +F: tests/unit/check-qom-interface.c +F: tests/unit/check-qom-proplist.c +F: tests/unit/test-qdev-global-props.c =20 QOM boilerplate conversion script M: Eduardo Habkost @@ -2721,10 +2721,10 @@ S: Maintained F: crypto/ F: include/crypto/ F: qapi/crypto.json -F: tests/test-crypto-* +F: tests/unit/test-crypto-* F: tests/benchmark-crypto-* -F: tests/crypto-tls-* -F: tests/pkix_asn1_tab.c +F: tests/unit/crypto-tls-* +F: tests/unit/pkix_asn1_tab.c F: qemu.sasl =20 Coroutines @@ -2733,7 +2733,7 @@ M: Kevin Wolf S: Maintained F: util/*coroutine* F: include/qemu/coroutine* -F: tests/test-coroutine.c +F: tests/unit/test-coroutine.c =20 Buffers M: Daniel P. Berrange @@ -2746,7 +2746,7 @@ M: Daniel P. Berrange S: Maintained F: io/ F: include/io/ -F: tests/test-io-* +F: tests/unit/test-io-* =20 User authorization M: Daniel P. Berrange @@ -2754,7 +2754,7 @@ S: Maintained F: authz/ F: qapi/authz.json F: include/authz/ -F: tests/test-authz-* +F: tests/unit/test-authz-* =20 Sockets M: Daniel P. Berrange @@ -2769,7 +2769,7 @@ M: Daniel P. Berrange S: Odd Fixes F: util/filemonitor*.c F: include/qemu/filemonitor.h -F: tests/test-util-filemonitor.c +F: tests/unit/test-util-filemonitor.c =20 Throttling infrastructure M: Alberto Garcia @@ -2779,7 +2779,7 @@ F: include/block/throttle-groups.h F: include/qemu/throttle*.h F: util/throttle.c F: docs/throttle.txt -F: tests/test-throttle.c +F: tests/unit/test-throttle.c L: qemu-block@nongnu.org =20 UUID @@ -2787,7 +2787,7 @@ M: Fam Zheng S: Supported F: util/uuid.c F: include/qemu/uuid.h -F: tests/test-uuid.c +F: tests/unit/test-uuid.c =20 Yank feature M: Lukas Straub @@ -3237,7 +3237,7 @@ M: Xie Changlong S: Supported F: replication* F: block/replication.c -F: tests/test-replication.c +F: tests/unit/test-replication.c F: docs/block-replication.txt =20 PVRDMA diff --git a/tests/meson.build b/tests/meson.build index 656d211e25..af43fd1eaf 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -69,59 +69,6 @@ endforeach libtestqapi =3D static_library('testqapi', sources: [genh, test_qapi_sourc= es]) testqapi =3D declare_dependency(link_with: libtestqapi, sources: [genh, te= st_qapi_headers]) =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-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_system or have_tools - tests +=3D { - 'test-qmp-event': [testqapi], - } -endif - test_deps =3D { 'test-qht-par': qht_bench, } @@ -129,65 +76,6 @@ test_deps =3D { benchs =3D {} =20 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 and \ - 'CONFIG_POSIX' in config_host - tests +=3D { - 'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1= _tab.c', - tasn1, crypto, gnutls], - 'test-crypto-tlssession': ['crypto-tls-x509-helpers.c', 'pkix_asn1_t= ab.c', 'crypto-tls-psk-helpers.c', - tasn1, crypto, gnutls], - 'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-hel= pers.c', 'pkix_asn1_tab.c', - tasn1, io, crypto, gnutls]} - 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 - 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 - if 'CONFIG_EPOLL_CREATE1' in config_host - tests +=3D {'test-fdmon-epoll': [testblock]} - endif benchs +=3D { 'benchmark-crypto-hash': [crypto], 'benchmark-crypto-hmac': [crypto], @@ -195,75 +83,6 @@ if have_block } endif =20 -if have_system - tests +=3D { - 'test-iov': [], - 'test-qmp-cmds': [testqapi], - 'test-xbzrle': [migration], - 'test-timed-average': [], - 'test-util-sockets': ['socket-helpers.c'], - 'test-base64': [], - 'test-bufferiszero': [], - 'test-vmstate': [migration, io] - } - 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 - if 'CONFIG_POSIX' in config_host - tests +=3D { - 'test-char': ['socket-helpers.c', qom, io, chardev] - } - endif - - tests +=3D { - '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']} - test_deps +=3D {'test-qga': qga} -endif - -test_env =3D environment() -test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) -test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) - -slow_tests =3D { - 'test-crypto-tlscredsx509': 45, - 'test-crypto-tlssession': 45 -} - -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, genh, dependencies: deps) - - test(test_name, exe, - depends: test_deps.get(test_name, []), - env: test_env, - args: ['--tap', '-k'], - protocol: 'tap', - timeout: slow_tests.get(test_name, 30), - priority: slow_tests.get(test_name, 30), - suite: ['unit']) -endforeach - foreach bench_name, deps: benchs exe =3D executable(bench_name, bench_name + '.c', dependencies: [qemuutil] + deps) @@ -299,6 +118,7 @@ if not get_option('tcg').disabled() endif endif =20 +subdir('unit') subdir('qapi-schema') subdir('qtest') subdir('migration') diff --git a/tests/check-block-qdict.c b/tests/unit/check-block-qdict.c similarity index 100% rename from tests/check-block-qdict.c rename to tests/unit/check-block-qdict.c diff --git a/tests/check-qdict.c b/tests/unit/check-qdict.c similarity index 100% rename from tests/check-qdict.c rename to tests/unit/check-qdict.c diff --git a/tests/check-qjson.c b/tests/unit/check-qjson.c similarity index 100% rename from tests/check-qjson.c rename to tests/unit/check-qjson.c diff --git a/tests/check-qlist.c b/tests/unit/check-qlist.c similarity index 100% rename from tests/check-qlist.c rename to tests/unit/check-qlist.c diff --git a/tests/check-qlit.c b/tests/unit/check-qlit.c similarity index 100% rename from tests/check-qlit.c rename to tests/unit/check-qlit.c diff --git a/tests/check-qnull.c b/tests/unit/check-qnull.c similarity index 100% rename from tests/check-qnull.c rename to tests/unit/check-qnull.c diff --git a/tests/check-qnum.c b/tests/unit/check-qnum.c similarity index 100% rename from tests/check-qnum.c rename to tests/unit/check-qnum.c diff --git a/tests/check-qobject.c b/tests/unit/check-qobject.c similarity index 100% rename from tests/check-qobject.c rename to tests/unit/check-qobject.c diff --git a/tests/check-qom-interface.c b/tests/unit/check-qom-interface.c similarity index 100% rename from tests/check-qom-interface.c rename to tests/unit/check-qom-interface.c diff --git a/tests/check-qom-proplist.c b/tests/unit/check-qom-proplist.c similarity index 100% rename from tests/check-qom-proplist.c rename to tests/unit/check-qom-proplist.c diff --git a/tests/check-qstring.c b/tests/unit/check-qstring.c similarity index 100% rename from tests/check-qstring.c rename to tests/unit/check-qstring.c diff --git a/tests/crypto-tls-psk-helpers.c b/tests/unit/crypto-tls-psk-hel= pers.c similarity index 100% rename from tests/crypto-tls-psk-helpers.c rename to tests/unit/crypto-tls-psk-helpers.c diff --git a/tests/crypto-tls-psk-helpers.h b/tests/unit/crypto-tls-psk-hel= pers.h similarity index 100% rename from tests/crypto-tls-psk-helpers.h rename to tests/unit/crypto-tls-psk-helpers.h diff --git a/tests/crypto-tls-x509-helpers.c b/tests/unit/crypto-tls-x509-h= elpers.c similarity index 100% rename from tests/crypto-tls-x509-helpers.c rename to tests/unit/crypto-tls-x509-helpers.c diff --git a/tests/crypto-tls-x509-helpers.h b/tests/unit/crypto-tls-x509-h= elpers.h similarity index 100% rename from tests/crypto-tls-x509-helpers.h rename to tests/unit/crypto-tls-x509-helpers.h diff --git a/tests/io-channel-helpers.c b/tests/unit/io-channel-helpers.c similarity index 100% rename from tests/io-channel-helpers.c rename to tests/unit/io-channel-helpers.c diff --git a/tests/io-channel-helpers.h b/tests/unit/io-channel-helpers.h similarity index 100% rename from tests/io-channel-helpers.h rename to tests/unit/io-channel-helpers.h diff --git a/tests/iothread.c b/tests/unit/iothread.c similarity index 100% rename from tests/iothread.c rename to tests/unit/iothread.c diff --git a/tests/iothread.h b/tests/unit/iothread.h similarity index 100% rename from tests/iothread.h rename to tests/unit/iothread.h diff --git a/tests/unit/meson.build b/tests/unit/meson.build new file mode 100644 index 0000000000..4bfe4627ba --- /dev/null +++ b/tests/unit/meson.build @@ -0,0 +1,184 @@ + +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-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_system or have_tools + tests +=3D { + 'test-qmp-event': [testqapi], + } +endif + +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 and \ + 'CONFIG_POSIX' in config_host + tests +=3D { + 'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1= _tab.c', + tasn1, crypto, gnutls], + 'test-crypto-tlssession': ['crypto-tls-x509-helpers.c', 'pkix_asn1_t= ab.c', 'crypto-tls-psk-helpers.c', + tasn1, crypto, gnutls], + 'test-io-channel-tls': ['io-channel-helpers.c', 'crypto-tls-x509-hel= pers.c', 'pkix_asn1_tab.c', + tasn1, io, crypto, gnutls]} + 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 + 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 + if 'CONFIG_EPOLL_CREATE1' in config_host + tests +=3D {'test-fdmon-epoll': [testblock]} + endif +endif + +if have_system + tests +=3D { + 'test-iov': [], + 'test-qmp-cmds': [testqapi], + 'test-xbzrle': [migration], + 'test-timed-average': [], + 'test-util-sockets': ['socket-helpers.c'], + 'test-base64': [], + 'test-bufferiszero': [], + 'test-vmstate': [migration, io] + } + 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 + if 'CONFIG_POSIX' in config_host + tests +=3D { + 'test-char': ['socket-helpers.c', qom, io, chardev] + } + endif + + tests +=3D { + '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']} + test_deps +=3D {'test-qga': qga} +endif + +test_env =3D environment() +test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) +test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) + +slow_tests =3D { + 'test-crypto-tlscredsx509': 45, + 'test-crypto-tlssession': 45 +} + +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, genh, dependencies: deps) + + test(test_name, exe, + depends: test_deps.get(test_name, []), + env: test_env, + args: ['--tap', '-k'], + protocol: 'tap', + timeout: slow_tests.get(test_name, 30), + priority: slow_tests.get(test_name, 30), + suite: ['unit']) +endforeach diff --git a/tests/pkix_asn1_tab.c b/tests/unit/pkix_asn1_tab.c similarity index 99% rename from tests/pkix_asn1_tab.c rename to tests/unit/pkix_asn1_tab.c index 4aaf736d3f..15397cf77a 100644 --- a/tests/pkix_asn1_tab.c +++ b/tests/unit/pkix_asn1_tab.c @@ -4,7 +4,7 @@ */ =20 #include "qemu/osdep.h" -#include "tests/crypto-tls-x509-helpers.h" +#include "crypto-tls-x509-helpers.h" =20 #ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT =20 diff --git a/tests/ptimer-test-stubs.c b/tests/unit/ptimer-test-stubs.c similarity index 100% rename from tests/ptimer-test-stubs.c rename to tests/unit/ptimer-test-stubs.c diff --git a/tests/ptimer-test.c b/tests/unit/ptimer-test.c similarity index 100% rename from tests/ptimer-test.c rename to tests/unit/ptimer-test.c diff --git a/tests/ptimer-test.h b/tests/unit/ptimer-test.h similarity index 100% rename from tests/ptimer-test.h rename to tests/unit/ptimer-test.h diff --git a/tests/rcutorture.c b/tests/unit/rcutorture.c similarity index 100% rename from tests/rcutorture.c rename to tests/unit/rcutorture.c diff --git a/tests/socket-helpers.c b/tests/unit/socket-helpers.c similarity index 100% rename from tests/socket-helpers.c rename to tests/unit/socket-helpers.c diff --git a/tests/socket-helpers.h b/tests/unit/socket-helpers.h similarity index 100% rename from tests/socket-helpers.h rename to tests/unit/socket-helpers.h diff --git a/tests/test-aio-multithread.c b/tests/unit/test-aio-multithread= .c similarity index 100% rename from tests/test-aio-multithread.c rename to tests/unit/test-aio-multithread.c diff --git a/tests/test-aio.c b/tests/unit/test-aio.c similarity index 100% rename from tests/test-aio.c rename to tests/unit/test-aio.c diff --git a/tests/test-authz-list.c b/tests/unit/test-authz-list.c similarity index 100% rename from tests/test-authz-list.c rename to tests/unit/test-authz-list.c diff --git a/tests/test-authz-listfile.c b/tests/unit/test-authz-listfile.c similarity index 100% rename from tests/test-authz-listfile.c rename to tests/unit/test-authz-listfile.c diff --git a/tests/test-authz-pam.c b/tests/unit/test-authz-pam.c similarity index 100% rename from tests/test-authz-pam.c rename to tests/unit/test-authz-pam.c diff --git a/tests/test-authz-simple.c b/tests/unit/test-authz-simple.c similarity index 100% rename from tests/test-authz-simple.c rename to tests/unit/test-authz-simple.c diff --git a/tests/test-base64.c b/tests/unit/test-base64.c similarity index 100% rename from tests/test-base64.c rename to tests/unit/test-base64.c diff --git a/tests/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c similarity index 100% rename from tests/test-bdrv-drain.c rename to tests/unit/test-bdrv-drain.c diff --git a/tests/test-bdrv-graph-mod.c b/tests/unit/test-bdrv-graph-mod.c similarity index 100% rename from tests/test-bdrv-graph-mod.c rename to tests/unit/test-bdrv-graph-mod.c diff --git a/tests/test-bitcnt.c b/tests/unit/test-bitcnt.c similarity index 100% rename from tests/test-bitcnt.c rename to tests/unit/test-bitcnt.c diff --git a/tests/test-bitmap.c b/tests/unit/test-bitmap.c similarity index 100% rename from tests/test-bitmap.c rename to tests/unit/test-bitmap.c diff --git a/tests/test-bitops.c b/tests/unit/test-bitops.c similarity index 100% rename from tests/test-bitops.c rename to tests/unit/test-bitops.c diff --git a/tests/test-block-backend.c b/tests/unit/test-block-backend.c similarity index 100% rename from tests/test-block-backend.c rename to tests/unit/test-block-backend.c diff --git a/tests/test-block-iothread.c b/tests/unit/test-block-iothread.c similarity index 100% rename from tests/test-block-iothread.c rename to tests/unit/test-block-iothread.c diff --git a/tests/test-blockjob-txn.c b/tests/unit/test-blockjob-txn.c similarity index 100% rename from tests/test-blockjob-txn.c rename to tests/unit/test-blockjob-txn.c diff --git a/tests/test-blockjob.c b/tests/unit/test-blockjob.c similarity index 100% rename from tests/test-blockjob.c rename to tests/unit/test-blockjob.c diff --git a/tests/test-bufferiszero.c b/tests/unit/test-bufferiszero.c similarity index 100% rename from tests/test-bufferiszero.c rename to tests/unit/test-bufferiszero.c diff --git a/tests/test-char.c b/tests/unit/test-char.c similarity index 100% rename from tests/test-char.c rename to tests/unit/test-char.c diff --git a/tests/test-clone-visitor.c b/tests/unit/test-clone-visitor.c similarity index 100% rename from tests/test-clone-visitor.c rename to tests/unit/test-clone-visitor.c diff --git a/tests/test-coroutine.c b/tests/unit/test-coroutine.c similarity index 100% rename from tests/test-coroutine.c rename to tests/unit/test-coroutine.c diff --git a/tests/test-crypto-afsplit.c b/tests/unit/test-crypto-afsplit.c similarity index 100% rename from tests/test-crypto-afsplit.c rename to tests/unit/test-crypto-afsplit.c diff --git a/tests/test-crypto-block.c b/tests/unit/test-crypto-block.c similarity index 100% rename from tests/test-crypto-block.c rename to tests/unit/test-crypto-block.c diff --git a/tests/test-crypto-cipher.c b/tests/unit/test-crypto-cipher.c similarity index 100% rename from tests/test-crypto-cipher.c rename to tests/unit/test-crypto-cipher.c diff --git a/tests/test-crypto-hash.c b/tests/unit/test-crypto-hash.c similarity index 100% rename from tests/test-crypto-hash.c rename to tests/unit/test-crypto-hash.c diff --git a/tests/test-crypto-hmac.c b/tests/unit/test-crypto-hmac.c similarity index 100% rename from tests/test-crypto-hmac.c rename to tests/unit/test-crypto-hmac.c diff --git a/tests/test-crypto-ivgen.c b/tests/unit/test-crypto-ivgen.c similarity index 100% rename from tests/test-crypto-ivgen.c rename to tests/unit/test-crypto-ivgen.c diff --git a/tests/test-crypto-pbkdf.c b/tests/unit/test-crypto-pbkdf.c similarity index 100% rename from tests/test-crypto-pbkdf.c rename to tests/unit/test-crypto-pbkdf.c diff --git a/tests/test-crypto-secret.c b/tests/unit/test-crypto-secret.c similarity index 100% rename from tests/test-crypto-secret.c rename to tests/unit/test-crypto-secret.c diff --git a/tests/test-crypto-tlscredsx509.c b/tests/unit/test-crypto-tlsc= redsx509.c similarity index 100% rename from tests/test-crypto-tlscredsx509.c rename to tests/unit/test-crypto-tlscredsx509.c diff --git a/tests/test-crypto-tlssession.c b/tests/unit/test-crypto-tlsses= sion.c similarity index 100% rename from tests/test-crypto-tlssession.c rename to tests/unit/test-crypto-tlssession.c diff --git a/tests/test-crypto-xts.c b/tests/unit/test-crypto-xts.c similarity index 100% rename from tests/test-crypto-xts.c rename to tests/unit/test-crypto-xts.c diff --git a/tests/test-cutils.c b/tests/unit/test-cutils.c similarity index 100% rename from tests/test-cutils.c rename to tests/unit/test-cutils.c diff --git a/tests/test-fdmon-epoll.c b/tests/unit/test-fdmon-epoll.c similarity index 100% rename from tests/test-fdmon-epoll.c rename to tests/unit/test-fdmon-epoll.c diff --git a/tests/test-hbitmap.c b/tests/unit/test-hbitmap.c similarity index 100% rename from tests/test-hbitmap.c rename to tests/unit/test-hbitmap.c diff --git a/tests/test-image-locking.c b/tests/unit/test-image-locking.c similarity index 100% rename from tests/test-image-locking.c rename to tests/unit/test-image-locking.c diff --git a/tests/test-int128.c b/tests/unit/test-int128.c similarity index 100% rename from tests/test-int128.c rename to tests/unit/test-int128.c diff --git a/tests/test-io-channel-buffer.c b/tests/unit/test-io-channel-bu= ffer.c similarity index 100% rename from tests/test-io-channel-buffer.c rename to tests/unit/test-io-channel-buffer.c diff --git a/tests/test-io-channel-command.c b/tests/unit/test-io-channel-c= ommand.c similarity index 100% rename from tests/test-io-channel-command.c rename to tests/unit/test-io-channel-command.c diff --git a/tests/test-io-channel-file.c b/tests/unit/test-io-channel-file= .c similarity index 100% rename from tests/test-io-channel-file.c rename to tests/unit/test-io-channel-file.c diff --git a/tests/test-io-channel-socket.c b/tests/unit/test-io-channel-so= cket.c similarity index 100% rename from tests/test-io-channel-socket.c rename to tests/unit/test-io-channel-socket.c diff --git a/tests/test-io-channel-tls.c b/tests/unit/test-io-channel-tls.c similarity index 100% rename from tests/test-io-channel-tls.c rename to tests/unit/test-io-channel-tls.c diff --git a/tests/test-io-task.c b/tests/unit/test-io-task.c similarity index 100% rename from tests/test-io-task.c rename to tests/unit/test-io-task.c diff --git a/tests/test-iov.c b/tests/unit/test-iov.c similarity index 100% rename from tests/test-iov.c rename to tests/unit/test-iov.c diff --git a/tests/test-keyval.c b/tests/unit/test-keyval.c similarity index 100% rename from tests/test-keyval.c rename to tests/unit/test-keyval.c diff --git a/tests/test-logging.c b/tests/unit/test-logging.c similarity index 100% rename from tests/test-logging.c rename to tests/unit/test-logging.c diff --git a/tests/test-mul64.c b/tests/unit/test-mul64.c similarity index 100% rename from tests/test-mul64.c rename to tests/unit/test-mul64.c diff --git a/tests/test-opts-visitor.c b/tests/unit/test-opts-visitor.c similarity index 100% rename from tests/test-opts-visitor.c rename to tests/unit/test-opts-visitor.c diff --git a/tests/test-qapi-util.c b/tests/unit/test-qapi-util.c similarity index 100% rename from tests/test-qapi-util.c rename to tests/unit/test-qapi-util.c diff --git a/tests/test-qdev-global-props.c b/tests/unit/test-qdev-global-p= rops.c similarity index 100% rename from tests/test-qdev-global-props.c rename to tests/unit/test-qdev-global-props.c diff --git a/tests/test-qdist.c b/tests/unit/test-qdist.c similarity index 100% rename from tests/test-qdist.c rename to tests/unit/test-qdist.c diff --git a/tests/test-qemu-opts.c b/tests/unit/test-qemu-opts.c similarity index 100% rename from tests/test-qemu-opts.c rename to tests/unit/test-qemu-opts.c diff --git a/tests/test-qga.c b/tests/unit/test-qga.c similarity index 99% rename from tests/test-qga.c rename to tests/unit/test-qga.c index eb33264e8e..5cb140d1b5 100644 --- a/tests/test-qga.c +++ b/tests/unit/test-qga.c @@ -4,7 +4,7 @@ #include #include =20 -#include "qtest/libqos/libqtest.h" +#include "../qtest/libqos/libqtest.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" =20 diff --git a/tests/test-qgraph.c b/tests/unit/test-qgraph.c similarity index 99% rename from tests/test-qgraph.c rename to tests/unit/test-qgraph.c index ae2f7b2dd8..f819430e2c 100644 --- a/tests/test-qgraph.c +++ b/tests/unit/test-qgraph.c @@ -17,8 +17,8 @@ */ =20 #include "qemu/osdep.h" -#include "qtest/libqos/qgraph.h" -#include "qtest/libqos/qgraph_internal.h" +#include "../qtest/libqos/qgraph.h" +#include "../qtest/libqos/qgraph_internal.h" =20 #define MACHINE_PC "x86_64/pc" #define MACHINE_RASPI2 "arm/raspi2" diff --git a/tests/test-qht.c b/tests/unit/test-qht.c similarity index 100% rename from tests/test-qht.c rename to tests/unit/test-qht.c diff --git a/tests/test-qmp-cmds.c b/tests/unit/test-qmp-cmds.c similarity index 100% rename from tests/test-qmp-cmds.c rename to tests/unit/test-qmp-cmds.c diff --git a/tests/test-qmp-event.c b/tests/unit/test-qmp-event.c similarity index 100% rename from tests/test-qmp-event.c rename to tests/unit/test-qmp-event.c diff --git a/tests/test-qobject-input-visitor.c b/tests/unit/test-qobject-i= nput-visitor.c similarity index 100% rename from tests/test-qobject-input-visitor.c rename to tests/unit/test-qobject-input-visitor.c diff --git a/tests/test-qobject-output-visitor.c b/tests/unit/test-qobject-= output-visitor.c similarity index 100% rename from tests/test-qobject-output-visitor.c rename to tests/unit/test-qobject-output-visitor.c diff --git a/tests/test-rcu-list.c b/tests/unit/test-rcu-list.c similarity index 100% rename from tests/test-rcu-list.c rename to tests/unit/test-rcu-list.c diff --git a/tests/test-rcu-simpleq.c b/tests/unit/test-rcu-simpleq.c similarity index 100% rename from tests/test-rcu-simpleq.c rename to tests/unit/test-rcu-simpleq.c diff --git a/tests/test-rcu-slist.c b/tests/unit/test-rcu-slist.c similarity index 100% rename from tests/test-rcu-slist.c rename to tests/unit/test-rcu-slist.c diff --git a/tests/test-rcu-tailq.c b/tests/unit/test-rcu-tailq.c similarity index 100% rename from tests/test-rcu-tailq.c rename to tests/unit/test-rcu-tailq.c diff --git a/tests/test-replication.c b/tests/unit/test-replication.c similarity index 100% rename from tests/test-replication.c rename to tests/unit/test-replication.c diff --git a/tests/test-shift128.c b/tests/unit/test-shift128.c similarity index 100% rename from tests/test-shift128.c rename to tests/unit/test-shift128.c diff --git a/tests/test-string-input-visitor.c b/tests/unit/test-string-inp= ut-visitor.c similarity index 100% rename from tests/test-string-input-visitor.c rename to tests/unit/test-string-input-visitor.c diff --git a/tests/test-string-output-visitor.c b/tests/unit/test-string-ou= tput-visitor.c similarity index 100% rename from tests/test-string-output-visitor.c rename to tests/unit/test-string-output-visitor.c diff --git a/tests/test-thread-pool.c b/tests/unit/test-thread-pool.c similarity index 100% rename from tests/test-thread-pool.c rename to tests/unit/test-thread-pool.c diff --git a/tests/test-throttle.c b/tests/unit/test-throttle.c similarity index 100% rename from tests/test-throttle.c rename to tests/unit/test-throttle.c diff --git a/tests/test-timed-average.c b/tests/unit/test-timed-average.c similarity index 100% rename from tests/test-timed-average.c rename to tests/unit/test-timed-average.c diff --git a/tests/test-util-filemonitor.c b/tests/unit/test-util-filemonit= or.c similarity index 100% rename from tests/test-util-filemonitor.c rename to tests/unit/test-util-filemonitor.c diff --git a/tests/test-util-sockets.c b/tests/unit/test-util-sockets.c similarity index 100% rename from tests/test-util-sockets.c rename to tests/unit/test-util-sockets.c diff --git a/tests/test-uuid.c b/tests/unit/test-uuid.c similarity index 100% rename from tests/test-uuid.c rename to tests/unit/test-uuid.c diff --git a/tests/test-visitor-serialization.c b/tests/unit/test-visitor-s= erialization.c similarity index 100% rename from tests/test-visitor-serialization.c rename to tests/unit/test-visitor-serialization.c diff --git a/tests/test-vmstate.c b/tests/unit/test-vmstate.c similarity index 100% rename from tests/test-vmstate.c rename to tests/unit/test-vmstate.c diff --git a/tests/test-write-threshold.c b/tests/unit/test-write-threshold= .c similarity index 100% rename from tests/test-write-threshold.c rename to tests/unit/test-write-threshold.c diff --git a/tests/test-x86-cpuid.c b/tests/unit/test-x86-cpuid.c similarity index 100% rename from tests/test-x86-cpuid.c rename to tests/unit/test-x86-cpuid.c diff --git a/tests/test-xbzrle.c b/tests/unit/test-xbzrle.c similarity index 100% rename from tests/test-xbzrle.c rename to tests/unit/test-xbzrle.c --=20 2.27.0 From nobody Sun May 19 03:12:48 2024 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=1615572691; cv=none; d=zohomail.com; s=zohoarc; b=hE7izZWLH6W2voJY7SBpFCUubf5y2M1+g4Asp+gTyvt1rH8pKbGpanermBdKQMuFLhlKB++ck+SMINN9nleUwziRaDmT6FZf+kxtGG2Njfmw3yZ81ugE7VwKi4AVWyj09Wp4+Fl23qspgqJGFODtbgLNLnDSKrv1bTNur6DaP3c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615572691; 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=UV6qEH9d29KpsCmMRutlaGT1AZj0e8gXQLM2MDRePww=; b=TKn+zra+iScTXti4hmLYZUyg6pwaYeSuGd/JOsReq0+l6JEFMf2PTQUlUuuHi5fIK9FN7nmfhZHt+GTxHOijEfodjNiLrPL3m+TTc4sfCnEyLQJ9cbRPM+J9iILkeR7MeAkp+u5NEmGArEAe4EkshHBjapqJNMlV9w2fiqYNOJI= 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 1615572691916115.44529781383744; Fri, 12 Mar 2021 10:11:31 -0800 (PST) Received: from localhost ([::1]:53750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKmG2-0006Ow-VU for importer@patchew.org; Fri, 12 Mar 2021 13:11:30 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKlWE-0007KE-4M for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32194) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKlWB-0000d4-1q for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:09 -0500 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-33-eFoE6moRNQ2EILoInsyyig-1; Fri, 12 Mar 2021 12:24:04 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DBA71800D55; Fri, 12 Mar 2021 17:24:02 +0000 (UTC) Received: from thuth.com (ovpn-112-83.ams2.redhat.com [10.36.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id E179B19744; Fri, 12 Mar 2021 17:24:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615569846; 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=UV6qEH9d29KpsCmMRutlaGT1AZj0e8gXQLM2MDRePww=; b=GxY1pX1GDYZtklzq+lpgcw8RXa8tHuXQ/7fj+E4jEB1lC8T4wPUuBhxtjHwTZcpuXVdxJY FNqi0Xsx5gCvZotAGH9hiHH2ucpsxyAR0q2Rvk5cFsQoEKZEaypkWO6jedK1NKJkfebQLH QGihYpChAclSS0Nx+m8bNTzF8MkF14w= X-MC-Unique: eFoE6moRNQ2EILoInsyyig-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 2/9] tests: Move benchmarks into a separate folder Date: Fri, 12 Mar 2021 18:23:49 +0100 Message-Id: <20210312172356.968219-3-thuth@redhat.com> In-Reply-To: <20210312172356.968219-1-thuth@redhat.com> References: <20210312172356.968219-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Make it clear that these files are related to benchmarks by moving them into a new folder called "bench". Message-Id: <20210312092238.79509-1-thuth@redhat.com> Acked-by: Paolo Bonzini Signed-off-by: Thomas Huth --- MAINTAINERS | 2 +- tests/{ =3D> bench}/atomic64-bench.c | 0 tests/{ =3D> bench}/atomic_add-bench.c | 0 tests/{ =3D> bench}/benchmark-crypto-cipher.c | 0 tests/{ =3D> bench}/benchmark-crypto-hash.c | 0 tests/{ =3D> bench}/benchmark-crypto-hmac.c | 0 tests/bench/meson.build | 34 +++++++++++++++++++++ tests/{ =3D> bench}/qht-bench.c | 0 tests/meson.build | 34 +-------------------- 9 files changed, 36 insertions(+), 34 deletions(-) rename tests/{ =3D> bench}/atomic64-bench.c (100%) rename tests/{ =3D> bench}/atomic_add-bench.c (100%) rename tests/{ =3D> bench}/benchmark-crypto-cipher.c (100%) rename tests/{ =3D> bench}/benchmark-crypto-hash.c (100%) rename tests/{ =3D> bench}/benchmark-crypto-hmac.c (100%) create mode 100644 tests/bench/meson.build rename tests/{ =3D> bench}/qht-bench.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index e6c43c6833..9a68f09b25 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2722,7 +2722,7 @@ F: crypto/ F: include/crypto/ F: qapi/crypto.json F: tests/unit/test-crypto-* -F: tests/benchmark-crypto-* +F: tests/bench/benchmark-crypto-* F: tests/unit/crypto-tls-* F: tests/unit/pkix_asn1_tab.c F: qemu.sasl diff --git a/tests/atomic64-bench.c b/tests/bench/atomic64-bench.c similarity index 100% rename from tests/atomic64-bench.c rename to tests/bench/atomic64-bench.c diff --git a/tests/atomic_add-bench.c b/tests/bench/atomic_add-bench.c similarity index 100% rename from tests/atomic_add-bench.c rename to tests/bench/atomic_add-bench.c diff --git a/tests/benchmark-crypto-cipher.c b/tests/bench/benchmark-crypto= -cipher.c similarity index 100% rename from tests/benchmark-crypto-cipher.c rename to tests/bench/benchmark-crypto-cipher.c diff --git a/tests/benchmark-crypto-hash.c b/tests/bench/benchmark-crypto-h= ash.c similarity index 100% rename from tests/benchmark-crypto-hash.c rename to tests/bench/benchmark-crypto-hash.c diff --git a/tests/benchmark-crypto-hmac.c b/tests/bench/benchmark-crypto-h= mac.c similarity index 100% rename from tests/benchmark-crypto-hmac.c rename to tests/bench/benchmark-crypto-hmac.c diff --git a/tests/bench/meson.build b/tests/bench/meson.build new file mode 100644 index 0000000000..00b3c209dc --- /dev/null +++ b/tests/bench/meson.build @@ -0,0 +1,34 @@ + +qht_bench =3D executable('qht-bench', + sources: 'qht-bench.c', + dependencies: [qemuutil]) + +executable('atomic_add-bench', + sources: files('atomic_add-bench.c'), + dependencies: [qemuutil], + build_by_default: false) + +executable('atomic64-bench', + sources: files('atomic64-bench.c'), + dependencies: [qemuutil], + build_by_default: false) + +benchs =3D {} + +if have_block + benchs +=3D { + 'benchmark-crypto-hash': [crypto], + 'benchmark-crypto-hmac': [crypto], + 'benchmark-crypto-cipher': [crypto], + } +endif + +foreach bench_name, deps: benchs + exe =3D executable(bench_name, bench_name + '.c', + dependencies: [qemuutil] + deps) + benchmark(bench_name, exe, + args: ['--tap', '-k'], + protocol: 'tap', + timeout: 0, + suite: ['speed']) +endforeach diff --git a/tests/qht-bench.c b/tests/bench/qht-bench.c similarity index 100% rename from tests/qht-bench.c rename to tests/bench/qht-bench.c diff --git a/tests/meson.build b/tests/meson.build index af43fd1eaf..55a7b08275 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,18 +1,6 @@ py3 =3D import('python').find_installation() =20 -qht_bench =3D executable('qht-bench', - sources: 'qht-bench.c', - dependencies: [qemuutil]) - -executable('atomic_add-bench', - sources: files('atomic_add-bench.c'), - dependencies: [qemuutil], - build_by_default: false) - -executable('atomic64-bench', - sources: files('atomic64-bench.c'), - dependencies: [qemuutil], - build_by_default: false) +subdir('bench') =20 test_qapi_outputs =3D [ 'qapi-builtin-types.c', @@ -73,26 +61,6 @@ test_deps =3D { 'test-qht-par': qht_bench, } =20 -benchs =3D {} - -if have_block - benchs +=3D { - 'benchmark-crypto-hash': [crypto], - 'benchmark-crypto-hmac': [crypto], - 'benchmark-crypto-cipher': [crypto], - } -endif - -foreach bench_name, deps: benchs - exe =3D executable(bench_name, bench_name + '.c', - dependencies: [qemuutil] + deps) - benchmark(bench_name, exe, - args: ['--tap', '-k'], - protocol: 'tap', - timeout: 0, - suite: ['speed']) -endforeach - if have_tools and 'CONFIG_VHOST_USER' in config_host and 'CONFIG_LINUX' in= config_host executable('vhost-user-bridge', sources: files('vhost-user-bridge.c'), --=20 2.27.0 From nobody Sun May 19 03:12:48 2024 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=1615572959; cv=none; d=zohomail.com; s=zohoarc; b=dWrOcq2lDV8PhOBuj1BupN8w1XFpqBwHc9fgJTbNTTnhGcBqDeIx4RbN0Bpgv6lHtdQAk1ln6S+mrRQsNbfuGZkVD2GT1HIjgitcj3Ins3CkoVmxfSVyUJrOjwVRB14nBo/0DDLlWQ5BJzi/luXF1+WexoFKAs9MOgIlwNQ6VVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615572959; 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=l2bWP9aI2Klknc3gKnUmWw+Ss+qoM5cSP7xG5mri9H4=; b=k/V7Z/04IvbHkMdeJCsiWzeM1JYZ6gkYT3ioqQeb7ts3XvRvstFP7mH2Erdj15mbYGCVJWM/YNTlKhgiRRjvWvdSyAwENFZX53BYbG528r1dLGOBNZJt3ND5gJSPoWjeqH5jDXJZxF/dmE45EvRLYzmtcjKTxgTrV50GGqgvlfY= 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 1615572959343772.0137406183375; Fri, 12 Mar 2021 10:15:59 -0800 (PST) Received: from localhost ([::1]:36172 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKmKM-00039o-Ja for importer@patchew.org; Fri, 12 Mar 2021 13:15:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58202) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKlWF-0007Mo-1p for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKlWC-0000eS-U2 for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:10 -0500 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-191-nIs7G4XFPIytWpVqkVnezA-1; Fri, 12 Mar 2021 12:24:05 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B06C100C661; Fri, 12 Mar 2021 17:24:04 +0000 (UTC) Received: from thuth.com (ovpn-112-83.ams2.redhat.com [10.36.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B51319744; Fri, 12 Mar 2021 17:24:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615569848; 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=l2bWP9aI2Klknc3gKnUmWw+Ss+qoM5cSP7xG5mri9H4=; b=h5oz81/EaFzRPMEijohSV7cITC2kz7o4nxROEChQqmCv8Cted7RxgzS+nOmjxNsqAzKP0G WmujAGtn7QEWId6slOuB0S6eO9CG3RGKjyzqdxFNa1RLKG/7AZGNmVN5MM6xDAusVuxXqO nZFz/CcHYN/RN1OMBnm412iHjT72y0E= X-MC-Unique: nIs7G4XFPIytWpVqkVnezA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 3/9] gitlab-ci.yml: Move build-tools-and-docs-debian to a better place Date: Fri, 12 Mar 2021 18:23:50 +0100 Message-Id: <20210312172356.968219-4-thuth@redhat.com> In-Reply-To: <20210312172356.968219-1-thuth@redhat.com> References: <20210312172356.968219-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The "build-tools-and-docs-debian" job had been added in between the "check-system-debian" and the "accepance-system-debian" jobs and thus separates the jobs that belong together. Move it away, to the end of the file, next to the "pages" job that depends on it. And while we're at it, also add a proper "needs:" line to the job so that it can be started as soon as possible instead of always waiting for the previous stage to finish. Message-Id: <20210311142211.1547864-2-thuth@redhat.com> Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07202f6ffb..871ea45a5f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -167,19 +167,6 @@ check-system-debian: IMAGE: debian-amd64 MAKE_CHECK_ARGS: check =20 -# No targets are built here, just tools, docs, and unit tests. This -# also feeds into the eventual documentation deployment steps later -build-tools-and-docs-debian: - <<: *native_build_job_definition - variables: - IMAGE: debian-amd64 - MAKE_CHECK_ARGS: check-unit check-softfloat ctags TAGS cscope - CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable= -tools - artifacts: - expire_in: 2 days - paths: - - build - acceptance-system-debian: <<: *native_test_job_definition needs: @@ -746,6 +733,21 @@ build-libvhost-user: - meson - ninja =20 +# No targets are built here, just tools, docs, and unit tests. This +# also feeds into the eventual documentation deployment steps later +build-tools-and-docs-debian: + <<: *native_build_job_definition + needs: + job: amd64-debian-container + variables: + IMAGE: debian-amd64 + MAKE_CHECK_ARGS: check-unit check-softfloat ctags TAGS cscope + CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable= -tools + artifacts: + expire_in: 2 days + paths: + - build + # Prepare for GitLab pages deployment. Anything copied into the # "public" directory will be deployed to $USER.gitlab.io/$PROJECT pages: --=20 2.27.0 From nobody Sun May 19 03:12:48 2024 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=1615572968; cv=none; d=zohomail.com; s=zohoarc; b=FPnG7GJgrov4oOKyyIGvQ0FNWC5bWWXjvkmVOV6pNmHiIPvSeJ5U2rks+miynyXbX+00Vf56PC0VsgBEdqzyNTvZv/0EC3B3T/51DOtuvVyIwbCcY8Ikga00UYn45/2UKXRa8d/GBYe4+KApTL6AHBRAhWQMS4zjJjvRTaGDYhw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615572968; 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=LI3EYlAVDfFNpaO5JjLNuRxJcyz1W2/SQ1KKdE+U64k=; b=GQ+pUFuEYphneR99p0di6+dNQie2H5fJRfo+Wz5QzP8v87nJnkJdV/lkQv0zRSwlR4nAv2EKxFAJV9et+DhnqBaS7mz0A6u1g7w3lUlUxN+nWTHuyKbL5uUMY7/TYxBugj/FnqGEJ+ETxnRs/b25CNm34n+822xXuby7IN/TbGQ= 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 161557296802832.19166279630588; Fri, 12 Mar 2021 10:16:08 -0800 (PST) Received: from localhost ([::1]:36686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKmKV-0003Ml-8v for importer@patchew.org; Fri, 12 Mar 2021 13:16:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKlWF-0007PH-UQ for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:59403) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKlWE-0000el-5R for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:11 -0500 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-377-J3_uUCQ2P46syJVP-CvjnQ-1; Fri, 12 Mar 2021 12:24:07 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D6EFA1084C8C; Fri, 12 Mar 2021 17:24:05 +0000 (UTC) Received: from thuth.com (ovpn-112-83.ams2.redhat.com [10.36.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id C63F519744; Fri, 12 Mar 2021 17:24:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615569849; 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=LI3EYlAVDfFNpaO5JjLNuRxJcyz1W2/SQ1KKdE+U64k=; b=KGNjdEyxyhZVMq2puye7iKeREiINX2CLzROcGxHp5xgroIkwbZBGq4mM8DjXkYqegpV7xy xH9KUNH3GPz9lCq0rOiUjgVl5cBvBKWz4r+BhkAWju5oPa8l2f737OjR4DhDrfqF5VdCWp p5Wn+Zc7YB6/uW3oI2Q5LvvdjRh11eo= X-MC-Unique: J3_uUCQ2P46syJVP-CvjnQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 4/9] gitlab-ci.yml: Add some missing dependencies to the jobs Date: Fri, 12 Mar 2021 18:23:51 +0100 Message-Id: <20210312172356.968219-5-thuth@redhat.com> In-Reply-To: <20210312172356.968219-1-thuth@redhat.com> References: <20210312172356.968219-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Let's make sure that all jobs have proper "needs:" statements so that they can start as soon as possible, without having to wait for the previous pipeline stage to finish. Message-Id: <20210311142211.1547864-3-thuth@redhat.com> Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 871ea45a5f..a98f5674d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -432,6 +432,8 @@ build-user-plugins: =20 build-user-centos7: <<: *native_build_job_definition + needs: + job: amd64-centos7-container variables: IMAGE: centos7 CONFIGURE_ARGS: --disable-system --disable-tools --disable-docs @@ -461,6 +463,8 @@ clang-system: =20 clang-user: <<: *native_build_job_definition + needs: + job: amd64-debian-user-cross-container variables: IMAGE: debian-all-test-cross CONFIGURE_ARGS: --cc=3Dclang --cxx=3Dclang++ --disable-system @@ -470,6 +474,8 @@ clang-user: =20 tsan-build: <<: *native_build_job_definition + needs: + job: amd64-ubuntu2004-container variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-tsan --cc=3Dclang-10 --cxx=3Dclang++-10 --dis= able-docs @@ -507,6 +513,8 @@ check-deprecated: # gprof/gcov are GCC features gprof-gcov: <<: *native_build_job_definition + needs: + job: amd64-ubuntu2004-container variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-gprof --enable-gcov --=20 2.27.0 From nobody Sun May 19 03:12:48 2024 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=1615572690; cv=none; d=zohomail.com; s=zohoarc; b=e5FCW0ESofC13YhFZbGWJqlOVQynZ1/qt/5u6gxl1rZsoUz7j4NNb7DrlEmaV2V/gJSxG1ViFvL2pOLHtUd4ybvCBizbfGjqRjgv2P9VDYfKz44EsFI3rSo1zPWV6JvAsHKrk1roFe0WT3y3tS5E68b/5agh4OH+6RuNHTa2LIw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615572690; 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=04yXZr1CYO0eJUg/Lk52VNhPIinTFA9fDfo6+CMMDrQ=; b=IN1n9t3UGiHoMPPB/5Af/Qucg2Z4GHnuDA+YAicZB6NEFEUFddB/gjnLgox7VtCJGMim6yl++dEP6oPVN7GZeW8YsaZneQbqtwpuvaY9Rb+EKmp/21G7YCx2bhRIrDsgPXfKLHK4m5ITagg8Yg1qya5N2x1Ycm2M03GPSVDwllk= 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 1615572690107973.4347701729187; Fri, 12 Mar 2021 10:11:30 -0800 (PST) Received: from localhost ([::1]:53476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKmG0-0006Hv-AK for importer@patchew.org; Fri, 12 Mar 2021 13:11:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKlWM-0007e8-25 for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:58847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKlWI-0000he-Kf for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:17 -0500 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-212-lcnd-Vl3OnWidcuS9HzCow-1; Fri, 12 Mar 2021 12:24:08 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3EE98801817; Fri, 12 Mar 2021 17:24:07 +0000 (UTC) Received: from thuth.com (ovpn-112-83.ams2.redhat.com [10.36.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4230319744; Fri, 12 Mar 2021 17:24:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615569853; 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=04yXZr1CYO0eJUg/Lk52VNhPIinTFA9fDfo6+CMMDrQ=; b=KiWs/NmfP+iajUNwP/QBpqCqko45WH1rogjrdvHfEIWsuDgcIolVYYAqVqjM+XCvylRLVJ XE39pPIDRxWqjItWV+f48gH/nQnjyx2CfLLQMra68vx5Hgix2EZuYvU9304RYivcPlgAmx LRonpYlb7ttzVNPrTecm+C9v8Xqo4kg= X-MC-Unique: lcnd-Vl3OnWidcuS9HzCow-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 5/9] gitlab-ci.yml: Merge one of the coroutine jobs with the tcg-disabled job Date: Fri, 12 Mar 2021 18:23:52 +0100 Message-Id: <20210312172356.968219-6-thuth@redhat.com> In-Reply-To: <20210312172356.968219-1-thuth@redhat.com> References: <20210312172356.968219-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Our gitlab-ci got quite slow in the past weeks, due to the immense amount of jobs that we have, so we should try to reduce the number of jobs. Since we already have a job that builds without TCG, we can merge one of the "build-coroutine" jobs with it to get rid of at least one job. Message-Id: <20210311142211.1547864-4-thuth@redhat.com> Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a98f5674d6..45303cafdd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -366,6 +366,8 @@ build-disabled: # Xen accelerator is not detected / selected. As result it build the # i386-softmmu and x86_64-softmmu with KVM being the single accelerator # available. +# Also use a different coroutine implementation (which is only really of +# interest to KVM users, i.e. with TCG disabled) build-tcg-disabled: <<: *native_build_job_definition needs: @@ -375,7 +377,8 @@ build-tcg-disabled: script: - mkdir build - cd build - - ../configure --disable-tcg --audio-drv-list=3D"" || { cat config.log= meson-logs/meson-log.txt && exit 1; } + - ../configure --disable-tcg --audio-drv-list=3D"" --with-coroutine=3D= ucontext + || { cat config.log meson-logs/meson-log.txt && exit 1; } - make -j"$JOBS" - make check-unit - make check-qapi-schema @@ -569,15 +572,6 @@ build-tci: =20 # Alternate coroutines implementations are only really of interest to KVM = users # However we can't test against KVM on Gitlab-CI so we can only run unit t= ests -build-coroutine-ucontext: - <<: *native_build_job_definition - needs: - job: amd64-ubuntu2004-container - variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --with-coroutine=3Ducontext --disable-tcg - MAKE_CHECK_ARGS: check-unit - build-coroutine-sigaltstack: <<: *native_build_job_definition needs: --=20 2.27.0 From nobody Sun May 19 03:12:48 2024 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=1615572516; cv=none; d=zohomail.com; s=zohoarc; b=FOrlC7BGlLRBBueiY7D11eW0v1Qd5mrfb+V36pS15oo7Uxso2PMl/fP7OEThquldr6xi7SECNjYztGWlVFjzn2sg7pMir4bdh5BXH0r3y1iY5BpX5cADGt5Vh5+Laj9tnxMDjiLmyJ0p5eg/tKrE+BmW0tO09cDpsNQ1jTuOO4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615572516; 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=uuIO2eGdt8JVyaXO9PJS3Ksym7cL+qi7MdjQn9vGnDk=; b=QWWw621hAYWih9gHJ3Na5XRn99I3zYo7ce3+hs96f6LxX8rcAyKMU4kzcUVjwzXQX5DzSUOTrZMqMtmN5B3Bzjlqq5ImT2zn7mvrt6VT1m0R4G8Kg3h6D1mp6VDBepICC85KbKw5zLlL5al2mDIc5dBQ+TG96CXGh8hlMyx1qZk= 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 1615572516213438.5759640251646; Fri, 12 Mar 2021 10:08:36 -0800 (PST) Received: from localhost ([::1]:45018 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKmDD-0002Hb-Eq for importer@patchew.org; Fri, 12 Mar 2021 13:08:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKlWJ-0007Yv-Io for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKlWG-0000hR-RQ for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:15 -0500 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-158-o5nBp8IYM9OSg762wz38SA-1; Fri, 12 Mar 2021 12:24:09 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A08F4800D62; Fri, 12 Mar 2021 17:24:08 +0000 (UTC) Received: from thuth.com (ovpn-112-83.ams2.redhat.com [10.36.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 942BF19744; Fri, 12 Mar 2021 17:24:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615569852; 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=uuIO2eGdt8JVyaXO9PJS3Ksym7cL+qi7MdjQn9vGnDk=; b=h8Am7k0UIyo11L/DMvldRZkkf7fAXcBMayjlddwKO7A/d0vQjSEb6uEIW76FDtEb/4F6uw ncCq03NQwuP1mEsWT/RgJb+sqfb1h60femzRvDIHIFmouODrjA/ctsvGEkJsZ5S59E0DtF 9iuXB/n4/f3/+jB7IrpF4/2ysbcqtKI= X-MC-Unique: o5nBp8IYM9OSg762wz38SA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 6/9] gitlab-ci.yml: Merge check-crypto-old jobs into the build-crypto-old jobs Date: Fri, 12 Mar 2021 18:23:53 +0100 Message-Id: <20210312172356.968219-7-thuth@redhat.com> In-Reply-To: <20210312172356.968219-1-thuth@redhat.com> References: <20210312172356.968219-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Both, the build-crypto-old and the check-crypto-old jobs finish reasonably fast, and the build artifacts are only used for the single corresponding check jobs, so there is no reason for doing the check step in a separate job here. Thus let's stop wasting artifacts space and job scheduler over- head by simply merging the test step into the build jobs. Message-Id: <20210311142211.1547864-5-thuth@redhat.com> Reviewed-by: Richard Henderson Signed-off-by: Thomas Huth --- .gitlab-ci.yml | 45 ++++----------------------------------------- 1 file changed, 4 insertions(+), 41 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45303cafdd..0ada3dbb90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -585,7 +585,7 @@ build-coroutine-sigaltstack: # # These jobs test old gcrypt and nettle from RHEL7 # which had some API differences. -build-crypto-old-nettle: +crypto-old-nettle: <<: *native_build_job_definition needs: job: amd64-centos7-container @@ -593,22 +593,9 @@ build-crypto-old-nettle: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user CONFIGURE_ARGS: --disable-gcrypt --enable-nettle - MAKE_CHECK_ARGS: check-build - artifacts: - paths: - - build - -check-crypto-old-nettle: - <<: *native_test_job_definition - needs: - - job: build-crypto-old-nettle - artifacts: true - variables: - IMAGE: centos7 MAKE_CHECK_ARGS: check =20 - -build-crypto-old-gcrypt: +crypto-old-gcrypt: <<: *native_build_job_definition needs: job: amd64-centos7-container @@ -616,22 +603,9 @@ build-crypto-old-gcrypt: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user CONFIGURE_ARGS: --disable-nettle --enable-gcrypt - MAKE_CHECK_ARGS: check-build - artifacts: - paths: - - build - -check-crypto-old-gcrypt: - <<: *native_test_job_definition - needs: - - job: build-crypto-old-gcrypt - artifacts: true - variables: - IMAGE: centos7 MAKE_CHECK_ARGS: check =20 - -build-crypto-only-gnutls: +crypto-only-gnutls: <<: *native_build_job_definition needs: job: amd64-centos7-container @@ -639,20 +613,9 @@ build-crypto-only-gnutls: IMAGE: centos7 TARGETS: x86_64-softmmu x86_64-linux-user CONFIGURE_ARGS: --disable-nettle --disable-gcrypt --enable-gnutls - MAKE_CHECK_ARGS: check-build - artifacts: - paths: - - build - -check-crypto-only-gnutls: - <<: *native_test_job_definition - needs: - - job: build-crypto-only-gnutls - artifacts: true - variables: - IMAGE: centos7 MAKE_CHECK_ARGS: check =20 + # We don't need to exercise every backend with every front-end build-trace-multi-user: <<: *native_build_job_definition --=20 2.27.0 From nobody Sun May 19 03:12:48 2024 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=1615573164; cv=none; d=zohomail.com; s=zohoarc; b=aZaqbh2sgXXyON0K2wMp1g2d4DP/Zj5NyIAVY5TZ+4Z38unWQexUM0dspVKnjbvowJfbanwXLkOy6pM+RKixzkB1kKMBs4YnhEA9Yd6BZ2BVY55aHhG8xtPI7bNzgk9Mdjzlnialvuin6d6vHVXtRmOIGaBAVk9DhJCPwO1jtwk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615573164; 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=PvcW1ai/Mc/z4nsjUH9/J6ybTbghIn0A68e75ujdf2g=; b=G96HZfdog1cBakYCQcTAHYRxYGkeVpQQr9YhiFwX5zHJuh0JIkkFC1ctFKAqSsbnGFs21CF9UtgFgnZnCMOnhqe7ky+jWJEHOOiGJQxvzksUfVSzF6nl7SwC2LMiiT7/KbmKnRJHMaihJle12vP9fQlFUlFzwNKjuEeNoj/HNs4= 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 1615573164000451.4560496623029; Fri, 12 Mar 2021 10:19:24 -0800 (PST) Received: from localhost ([::1]:45146 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKmNe-0007GX-T7 for importer@patchew.org; Fri, 12 Mar 2021 13:19:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKlWL-0007db-Q4 for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:26627) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKlWI-0000hd-LT for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:17 -0500 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-280-aTmk42IQN1ui9hQRjCpitg-1; Fri, 12 Mar 2021 12:24:11 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1AF06100C663; Fri, 12 Mar 2021 17:24:10 +0000 (UTC) Received: from thuth.com (ovpn-112-83.ams2.redhat.com [10.36.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0982D19704; Fri, 12 Mar 2021 17:24:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615569853; 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=PvcW1ai/Mc/z4nsjUH9/J6ybTbghIn0A68e75ujdf2g=; b=hwp8TSiCSSOJx3cSOuFELbU6zQWUyu0zkK7Mq+DwTpSXCYuthxJpu1aeIegJb2aJ7TJMKY 1fbwXnDxSlTRpVJFaQidIb08aPNM7WVRin6uXSxxhu2KQaqP7VYpQCjmV3RqsNdCGKhx6V OfM1sHOSls4lo0roCFGq/EyjL+bJGDE= X-MC-Unique: aTmk42IQN1ui9hQRjCpitg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 7/9] tests: remove "make check-speed" in favor of "make bench" Date: Fri, 12 Mar 2021 18:23:54 +0100 Message-Id: <20210312172356.968219-8-thuth@redhat.com> In-Reply-To: <20210312172356.968219-1-thuth@redhat.com> References: <20210312172356.968219-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Paolo Bonzini "make check-speed" has been broken since the removal of ninja2make last October. It was just a backwards-compatibility alias for "make bench-speed", which in turn is in principle a subset of "make bench". Advertise the latter and drop "make check-speed" completely since no one has noticed. Reported-by: Thomas Huth Signed-off-by: Paolo Bonzini Message-Id: <20210310164612.285362-1-pbonzini@redhat.com> Reviewed-by: Thomas Huth Reviewed-by: Willian Rampazzo Signed-off-by: Thomas Huth --- tests/Makefile.include | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 799e47169c..8f220e15d1 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -3,13 +3,13 @@ .PHONY: check-help check-help: @echo "Regression testing targets:" - @echo @echo " $(MAKE) check Run block, qapi-schema, unit, softfl= oat, qtest and decodetree tests" + @echo " $(MAKE) bench Run speed tests" @echo + @echo "Individual test suites:" @echo " $(MAKE) check-qtest-TARGET Run qtest tests for given target" @echo " $(MAKE) check-qtest Run qtest tests" @echo " $(MAKE) check-unit Run qobject tests" - @echo " $(MAKE) check-speed Run qobject speed tests" @echo " $(MAKE) check-qapi-schema Run QAPI schema tests" @echo " $(MAKE) check-block Run block tests" ifneq ($(filter $(all-check-targets), check-softfloat),) @@ -155,8 +155,4 @@ check-clean: =20 clean: check-clean =20 -# For backwards compatibility - -check-speed: bench-speed - endif --=20 2.27.0 From nobody Sun May 19 03:12:48 2024 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=1615572889; cv=none; d=zohomail.com; s=zohoarc; b=P+C9qhFduff9p7Rd7pnnnlg6iojgqBFzAcymOBGbbphezSA4ytOApDud4zv9rLgzrMHPCQLn6L20AmQRxiIGdhy6TAU5lZQN1xeSS8YIU10eboehn7i4d4zctZJ8yfmZaCEp6M43TCA/mP9SU9JlZKOpdTxO6U/u22fMrSo0zLM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615572889; 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=Ck0o8u8iaicyjbwugzYY7LiPcPw7lo+wpN33f9Wh8yk=; b=gZwHolZ5WK3ay7zk4QzP6skMWbxmBjjmeHI5zHxmx4wfJxl0qkjqHWT1bf0AdqmF0nSCMz33XVSDL6oMh9PBn3VjQWfRNFfwcgX/WRchEw/5X+e2PVuk+hixp54Hgdl0q67zIEyT6M69tH0ulYhOVOSQHu76yItpHRYeuyqxBjE= 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 1615572889923686.7044268311676; Fri, 12 Mar 2021 10:14:49 -0800 (PST) Received: from localhost ([::1]:33926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKmJF-0001hp-4u for importer@patchew.org; Fri, 12 Mar 2021 13:14:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKlWb-0007sV-7C for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29678) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKlWV-0000nD-6V for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:30 -0500 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-410-0roMZDtTNjuC2VsqTrS9hg-1; Fri, 12 Mar 2021 12:24:12 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7D5791084C95; Fri, 12 Mar 2021 17:24:11 +0000 (UTC) Received: from thuth.com (ovpn-112-83.ams2.redhat.com [10.36.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6E93019744; Fri, 12 Mar 2021 17:24:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615569866; 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=Ck0o8u8iaicyjbwugzYY7LiPcPw7lo+wpN33f9Wh8yk=; b=DrIHUBSOfimx4a40ksTzJbL2f4+PSwpdcGc7r+HWIwr7tywrx8NX5jsKftsaAS5JeWaEEz xhoQlIpg74Y5PBY5gJetK+LfdW/FTlkb83/l0dozvRDXu+FLCd8kWGvxoZia+Fx/KvjTrF grS0G5qN2w84yXCvhBpD7zun9R4lYso= X-MC-Unique: 0roMZDtTNjuC2VsqTrS9hg-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 8/9] MAINTAINERS: Merge the Gitlab-CI section into the generic CI section Date: Fri, 12 Mar 2021 18:23:55 +0100 Message-Id: <20210312172356.968219-9-thuth@redhat.com> In-Reply-To: <20210312172356.968219-1-thuth@redhat.com> References: <20210312172356.968219-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) The status of the gitlab-CI files is currently somewhat confusing, and it is often not quite clear whether a patch should go via my tree or via the testing tree of Alex. That situation has grown historically... Initially, I was the only one using the gitlab-CI, just for my private repository there. But in the course of time, the gitlab-CI switched to use the containers from tests/docker/ (which is not part of the gitlab-CI section in the MAINTAINERS file), and QEMU now even switched to gitlab.com completely for the repository and will soon use it as its gating CI, too, so it makes way more sense if the gitlab-ci.yml files belong to the people who are owning the qemu-project on gitlab.com and take care of the gitlab CI there. Thus let's merge the gitlab-ci section into the common "test and build automation" section. And while we're at it, I'm also removing the line with Fam there for now, since he was hardly active during the last years in this area anymore. If he ever gets more time for this part again in the future, we surely can add the line back again. I'm also removing the Patchew URL from this section now since Patchew's files are not tracked in the main QEMU repo and it is also not maintained by Alex, Philippe and myself. The maintainers of Patchew are still listed more accurately in the wiki on https://wiki.qemu.org/AdminContacts & https://wiki.qemu.org/Testing/CI/Patc= hew instead. Now to avoid that Alex is listed here in this section alone, Philippe and I agreed to help as backup maintainers here, too. And Willian volunteered to be an additional reviewer. Message-Id: <20210309112356.737266-1-thuth@redhat.com> Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Acked-by: Wainer dos Santos Moschetta Acked-by: Fam Zheng Signed-off-by: Thomas Huth --- MAINTAINERS | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9a68f09b25..430872e5d6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3282,19 +3282,23 @@ F: include/hw/remote/iohub.h =20 Build and test automation ------------------------- -Build and test automation +Build and test automation, general continuous integration M: Alex Benn=C3=A9e -M: Fam Zheng -R: Philippe Mathieu-Daud=C3=A9 +M: Philippe Mathieu-Daud=C3=A9 +M: Thomas Huth +R: Wainer dos Santos Moschetta +R: Willian Rampazzo S: Maintained F: .github/lockdown.yml +F: .gitlab-ci.yml +F: .gitlab-ci.d/ F: .travis.yml F: scripts/ci/ F: tests/docker/ F: tests/vm/ F: scripts/archive-source.sh +W: https://gitlab.com/qemu-project/qemu/pipelines W: https://travis-ci.org/qemu/qemu -W: http://patchew.org/QEMU/ =20 FreeBSD Hosted Continuous Integration M: Ed Maste @@ -3309,17 +3313,6 @@ S: Maintained F: .cirrus.yml W: https://cirrus-ci.com/github/qemu/qemu =20 -GitLab Continuous Integration -M: Thomas Huth -M: Philippe Mathieu-Daud=C3=A9 -M: Alex Benn=C3=A9e -R: Wainer dos Santos Moschetta -S: Maintained -F: .gitlab-ci.yml -F: .gitlab-ci.d/crossbuilds.yml -F: .gitlab-ci.d/*py -F: scripts/ci/gitlab-pipeline-status - Guest Test Compilation Support M: Alex Benn=C3=A9e R: Philippe Mathieu-Daud=C3=A9 --=20 2.27.0 From nobody Sun May 19 03:12:48 2024 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=1615573106; cv=none; d=zohomail.com; s=zohoarc; b=ZkwRcxDWtjxZeoL19+FHylirUt6vgHkgsNm5AIEMU17OqPenp9ADDSCBc1vdpKC1Zp9k1q+H87Q6JLP5UOS1c1HpEAjqLBeO1cW08CxOuy9RpD+LYNUswCxx8DrOMwvEaqd9TAGQ2e7RTRErrTyE3Lr5DcfPUMutcLunbhJ1S9A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615573106; 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=y3u9YRTJCNnnkPJFIhYEMaW1mD5nSFM7ktrkKODAAss=; b=k9QbW2vo1WftWPCwfydyItPMQFVlehJRYASPzcg1pIa3izYXer2VzaptBmYvVZeHDWgQpxEhJQw+6DOb8xcjK1f7Q/Cp3OnfCken1raTBkEnyM+bNKxpSaPN9Lb3095z84hwEchnrzT43HTyfRO5gva/mXoStfjLiA9/d1iMuDk= 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 1615573106748243.092301679078; Fri, 12 Mar 2021 10:18:26 -0800 (PST) Received: from localhost ([::1]:42848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKmMj-0006BM-7s for importer@patchew.org; Fri, 12 Mar 2021 13:18:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKlWO-0007kI-Vd for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:46895) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKlWN-0000jq-2l for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:20 -0500 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-504-rpAR-kYbMu2uUOMFkWbZvQ-1; Fri, 12 Mar 2021 12:24:13 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CD0FA1966320; Fri, 12 Mar 2021 17:24:12 +0000 (UTC) Received: from thuth.com (ovpn-112-83.ams2.redhat.com [10.36.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id C6F3319744; Fri, 12 Mar 2021 17:24:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615569858; 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=y3u9YRTJCNnnkPJFIhYEMaW1mD5nSFM7ktrkKODAAss=; b=DAGcd65ThBAG01bTX9/WJV8+2Z/ScB2G3EPV8yPpsHGgUD/ScG/G8vS7lRdR5oX+IwAFw0 nU3RBOoeML9Eu925yM+M5LHl66Yknp8PDgM8m0FxybvBFLGrp5ieujgHiybFNye8wsvmNP ExEkqKGO2hS7W+sHwy/RCfwDWT9/x0E= X-MC-Unique: rpAR-kYbMu2uUOMFkWbZvQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 9/9] README: Add Documentation blurb Date: Fri, 12 Mar 2021 18:23:56 +0100 Message-Id: <20210312172356.968219-10-thuth@redhat.com> In-Reply-To: <20210312172356.968219-1-thuth@redhat.com> References: <20210312172356.968219-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: John Snow Add it in a prominent place: Right after figuring out what QEMU is, users may wish to know how to use it more than they want to know how to build their own version of it. Signed-off-by: John Snow Message-Id: <20201104193032.1319248-1-jsnow@redhat.com> Signed-off-by: Thomas Huth --- README.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.rst b/README.rst index 91aa1e314c..a92c7394b7 100644 --- a/README.rst +++ b/README.rst @@ -31,6 +31,17 @@ QEMU as a whole is released under the GNU General Public= License, version 2. For full licensing details, consult the LICENSE file. =20 =20 +Documentation +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Documentation can be found hosted online at +``_. The documentation for the +current development version that is available at +``_ is generated from the ``docs/`` +folder in the source tree, and is built by `Sphinx +_`. + + Building =3D=3D=3D=3D=3D=3D=3D=3D =20 --=20 2.27.0