From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598612936; cv=none; d=zohomail.com; s=zohoarc; b=dwa3Wnkhpt1z2A0GyOMYmoxGDxOspxyGabJ8+Oq8corgN8dwCMxQsdUrgv2EvwBppHQxX/w9PBp8SPGMR5+23XQlQYPMqN0L3Rc+m05UnyENJryrS76w4G0/YPWIG24SdQ307+0VijcJ40XXD8Xg+cmF0nY5xgFN3KdErqNqDuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598612936; 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=TDYi72xiOxaVPRwJw8viMTlmYaQgiX+KXSwGMtlZHCI=; b=TkyhpPqOQrQifnWUvh/H2ToBr1lKW51kQr2e/4VVXzqmecZKJ2QPPhV+kyNJdhmsYOBVKIlZePUV1w9MYB7A03uKg9KSbN1NNyeg/8uppwpzPqxhUU7QHdDLyGMM6HQVE7xsqOoulf0dN8BSbgF25MgT1TvF/2kb8Q4SOb0VU/M= 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 1598612936373289.43970184948137; Fri, 28 Aug 2020 04:08:56 -0700 (PDT) Received: from localhost ([::1]:33112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcFZ-0002yO-Tz for importer@patchew.org; Fri, 28 Aug 2020 07:08:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39366) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcEe-0001il-L3 for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:07:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcEb-0000Nf-Qs for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:07:56 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-410-z5bL0senMwaeKQzMYV-7uA-1; Fri, 28 Aug 2020 07:07:50 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E04CD80EF9D for ; Fri, 28 Aug 2020 11:07:49 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8705560BA7; Fri, 28 Aug 2020 11:07:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612872; 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=TDYi72xiOxaVPRwJw8viMTlmYaQgiX+KXSwGMtlZHCI=; b=TgwUWFqTURS8MfsIDhslbuN1TzRRRRCNUIrQ5vBNZAQNZFVhWD8wiByWoXtvLJzOo6G+OX zN5KzvUrNGKj5KzSispvdHTKLKSjY6TCCVTM+u55JnGFxaj1PH2zAWQzXIK6HWj9Xs4pCa FJKWBRnYIvAqZbnV11IODlfJzR+FDgw= X-MC-Unique: z5bL0senMwaeKQzMYV-7uA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 01/16] meson: build qapi tests library Date: Fri, 28 Aug 2020 15:07:19 +0400 Message-Id: <20200828110734.1638685-2-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 04:08:55 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau - builds QAPI builtins types/visitor to fix a linking issue with unresolved symbols in the static library. - work around a meson limitation on generated file output directories. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/Makefile.include | 79 +-------------------------------------- tests/include/meson.build | 13 +++++++ tests/meson.build | 44 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 78 deletions(-) create mode 100644 tests/include/meson.build diff --git a/tests/Makefile.include b/tests/Makefile.include index a9746c2ecb..9e72cfefbe 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -34,23 +34,6 @@ endif ifneq ($(wildcard config-host.mak),) export SRC_PATH =20 -# TODO don't duplicate $(SRC_PATH)/Makefile's qapi-py here -qapi-py =3D $(SRC_PATH)/scripts/qapi/__init__.py \ -$(SRC_PATH)/scripts/qapi/commands.py \ -$(SRC_PATH)/scripts/qapi/common.py \ -$(SRC_PATH)/scripts/qapi/doc.py \ -$(SRC_PATH)/scripts/qapi/error.py \ -$(SRC_PATH)/scripts/qapi/events.py \ -$(SRC_PATH)/scripts/qapi/expr.py \ -$(SRC_PATH)/scripts/qapi/gen.py \ -$(SRC_PATH)/scripts/qapi/introspect.py \ -$(SRC_PATH)/scripts/qapi/parser.py \ -$(SRC_PATH)/scripts/qapi/schema.py \ -$(SRC_PATH)/scripts/qapi/source.py \ -$(SRC_PATH)/scripts/qapi/types.py \ -$(SRC_PATH)/scripts/qapi/visit.py \ -$(SRC_PATH)/scripts/qapi-gen.py - # Get the list of all supported sysemu targets SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ $(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak))) @@ -164,36 +147,13 @@ ifeq ($(CONFIG_BLOCK)$(CONFIG_REPLICATION)$(CONFIG_PO= SIX),yyy) check-unit-y +=3D tests/test-replication$(EXESUF) endif =20 -generated-files-y +=3D tests/test-qapi-types.h -generated-files-y +=3D tests/include/test-qapi-types-sub-module.h -generated-files-y +=3D tests/test-qapi-types-sub-sub-module.h -generated-files-y +=3D tests/test-qapi-visit.h -generated-files-y +=3D tests/include/test-qapi-visit-sub-module.h -generated-files-y +=3D tests/test-qapi-visit-sub-sub-module.h -generated-files-y +=3D tests/test-qapi-commands.h -generated-files-y +=3D tests/test-qapi-init-commands.h -generated-files-y +=3D tests/include/test-qapi-commands-sub-module.h -generated-files-y +=3D tests/test-qapi-commands-sub-sub-module.h -generated-files-y +=3D tests/test-qapi-emit-events.h -generated-files-y +=3D tests/test-qapi-events.h -generated-files-y +=3D tests/include/test-qapi-events-sub-module.h -generated-files-y +=3D tests/test-qapi-events-sub-sub-module.h -generated-files-y +=3D tests/test-qapi-introspect.h - QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest =20 =20 # Deps that are common to various different sets of tests below test-util-obj-y =3D libqemuutil.a test-qom-obj-y =3D $(qom-obj-y) $(test-util-obj-y) -test-qapi-obj-y =3D tests/test-qapi-types.o \ - tests/include/test-qapi-types-sub-module.o \ - tests/test-qapi-types-sub-sub-module.o \ - tests/test-qapi-visit.o \ - tests/include/test-qapi-visit-sub-module.o \ - tests/test-qapi-visit-sub-sub-module.o \ - tests/test-qapi-introspect.o \ - $(test-qom-obj-y) +test-qapi-obj-y =3D $(test-qom-obj-y) tests/libtestqapi.a benchmark-crypto-obj-$(CONFIG_BLOCK) =3D $(authz-obj-y) $(crypto-obj-y) $(= test-qom-obj-y) test-crypto-obj-$(CONFIG_BLOCK) =3D $(authz-obj-y) $(crypto-obj-y) $(test-= qom-obj-y) test-io-obj-$(CONFIG_BLOCK) =3D $(io-obj-y) $(test-crypto-obj-y) @@ -264,42 +224,6 @@ tests/test-logging$(EXESUF): tests/test-logging.o $(te= st-util-obj-y) tests/test-replication$(EXESUF): tests/test-replication.o $(test-util-obj-= y) \ $(test-block-obj-y) =20 -tests/test-qapi-types.c tests/test-qapi-types.h \ -tests/include/test-qapi-types-sub-module.c \ -tests/include/test-qapi-types-sub-module.h \ -tests/test-qapi-types-sub-sub-module.c \ -tests/test-qapi-types-sub-sub-module.h \ -tests/test-qapi-visit.c tests/test-qapi-visit.h \ -tests/include/test-qapi-visit-sub-module.c \ -tests/include/test-qapi-visit-sub-module.h \ -tests/test-qapi-visit-sub-sub-module.c \ -tests/test-qapi-visit-sub-sub-module.h \ -tests/test-qapi-commands.h tests/test-qapi-commands.c \ -tests/include/test-qapi-commands-sub-module.h \ -tests/include/test-qapi-commands-sub-module.c \ -tests/test-qapi-commands-sub-sub-module.h \ -tests/test-qapi-commands-sub-sub-module.c \ -tests/test-qapi-emit-events.c tests/test-qapi-emit-events.h \ -tests/test-qapi-events.c tests/test-qapi-events.h \ -tests/test-qapi-init-commands.c \ -tests/test-qapi-init-commands.h \ -tests/include/test-qapi-events-sub-module.c \ -tests/include/test-qapi-events-sub-module.h \ -tests/test-qapi-events-sub-sub-module.c \ -tests/test-qapi-events-sub-sub-module.h \ -tests/test-qapi-introspect.c tests/test-qapi-introspect.h: \ -tests/test-qapi-gen-timestamp ; -tests/test-qapi-gen-timestamp: \ - $(SRC_PATH)/tests/qapi-schema/qapi-schema-test.json \ - $(SRC_PATH)/tests/qapi-schema/include/sub-module.json \ - $(SRC_PATH)/tests/qapi-schema/sub-sub-module.json \ - $(qapi-py) - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \ - -o tests -p "test-" $<, \ - "GEN","$(@:%-timestamp=3D%)") - @rm -f tests/test-qapi-doc.texi - @>$@ - tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visito= r.o $(test-qapi-obj-y) tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.= o $(test-qapi-obj-y) tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) t= ests/test-qapi-emit-events.o tests/test-qapi-events.o @@ -532,7 +456,6 @@ check-build: build-unit =20 check-clean: rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) - rm -f tests/test-qapi-gen-timestamp rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) =20 check: check-unit diff --git a/tests/include/meson.build b/tests/include/meson.build new file mode 100644 index 0000000000..835872643e --- /dev/null +++ b/tests/include/meson.build @@ -0,0 +1,13 @@ +# an extra target to workaround meson limitation on output files location +test_qapi_outputs_extra =3D [ + 'test-qapi-commands-sub-module.c', + 'test-qapi-commands-sub-module.h', + 'test-qapi-events-sub-module.c', + 'test-qapi-events-sub-module.h', + 'test-qapi-types-sub-module.c', + 'test-qapi-types-sub-module.h', + 'test-qapi-visit-sub-module.c', + 'test-qapi-visit-sub-module.h', +] + +test_qapi_outputs_extra =3D custom_target('QAPI test include', output: tes= t_qapi_outputs_extra, command: 'true') diff --git a/tests/meson.build b/tests/meson.build index fe2c6d8e6b..3c1586f110 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,3 +1,47 @@ +test_qapi_outputs =3D [ + 'qapi-builtin-types.c', + 'qapi-builtin-types.h', + 'qapi-builtin-visit.c', + 'qapi-builtin-visit.h', + 'test-qapi-commands-sub-sub-module.c', + 'test-qapi-commands-sub-sub-module.h', + 'test-qapi-commands.c', + 'test-qapi-commands.h', + 'test-qapi-emit-events.c', + 'test-qapi-emit-events.h', + 'test-qapi-events-sub-sub-module.c', + 'test-qapi-events-sub-sub-module.h', + 'test-qapi-events.c', + 'test-qapi-events.h', + 'test-qapi-init-commands.c', + 'test-qapi-init-commands.h', + 'test-qapi-introspect.c', + 'test-qapi-introspect.h', + 'test-qapi-types-sub-sub-module.c', + 'test-qapi-types-sub-sub-module.h', + 'test-qapi-types.c', + 'test-qapi-types.h', + 'test-qapi-visit-sub-sub-module.c', + 'test-qapi-visit-sub-sub-module.h', + 'test-qapi-visit.c', + 'test-qapi-visit.h', +] + +# meson doesn't like generated output in other directories: +subdir('include') + +test_qapi_files =3D custom_target('Test QAPI files', + output: test_qapi_outputs, + input: files('qapi-schema/qapi-schema-test= .json', + 'qapi-schema/include/sub-modu= le.json', + 'qapi-schema/sub-sub-module.j= son'), + command: [ qapi_gen, '-o', meson.current_b= uild_dir(), + '-b', '-p', 'test-', '@INPUT0@'= ], + depend_files: qapi_gen_depends) + +libtestqapi =3D static_library('testqapi', sources: [test_qapi_files, test= _qapi_outputs_extra]) +testqapi =3D declare_dependency(link_with: libtestqapi) + if have_system and 'CONFIG_POSIX' in config_host subdir('qemu-iotests') endif --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598612942; cv=none; d=zohomail.com; s=zohoarc; b=VcNzYerQ8jzwvgxCkWYwjBwS3Lz+PkjGap4Tjnx+F/bgsGbOYHA0M7zkan823WSl0wj5Jd+Ab9eiravjBNIwFYJEyNlen/9RV4l/hmcFtMbh+Y06zm+imLPGSj8/Z6xzRAOh+KniuYj0iOVH0NNzYl7I4I0m28xvE9T6bS0ZWO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598612942; 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=vgvH5LZTKouaCaPhOVmtES5ueNB/zwfdlXhtvdNj5No=; b=Nd+koPCUE2Zq7HXvHHpMiir2ZicHo+3OW/qpzD6ij5Yexyc8kVGtfZs0MRcJyHjVydFp6IUWUZ14NQ1Sl8GZbIjhGlLZKGbg3Z0Ne5Pze0MsuSzx6ZB6TJkebI8WrJ0Cmj/9BAlKNaZqCzSpMvzOqDW87swsu8Omyted0Clo9D0= 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 1598612942689309.9983136816104; Fri, 28 Aug 2020 04:09:02 -0700 (PDT) Received: from localhost ([::1]:34030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcFh-0003Mh-Cv for importer@patchew.org; Fri, 28 Aug 2020 07:09:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcEl-0001u9-99 for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:03 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:33937) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcEj-0000OP-NQ for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:02 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-21-PdwtHMs-NdCFlKL2BKSgXA-1; Fri, 28 Aug 2020 07:07:58 -0400 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 095C1100746C for ; Fri, 28 Aug 2020 11:07:58 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id E885A19C59; Fri, 28 Aug 2020 11:07:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612880; 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=vgvH5LZTKouaCaPhOVmtES5ueNB/zwfdlXhtvdNj5No=; b=Bf7o4+4U/LyR5vUN/cQCKifetBgwmpXl9BVCxjOWtk7jpFaW4BrkZygLoUAO9e4x4jwnHi iFyRNQkM+aXRyGoA6jMxfYLxITlWlYpy39RemH8pT5kpoca7Rd4Rdy/Qn8nb+sCfUR0eT9 6hpaODhqEIkunI3HtNft7Xw907WSZEM= X-MC-Unique: PdwtHMs-NdCFlKL2BKSgXA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 02/16] meson: declare tasn1 dependency Date: Fri, 28 Aug 2020 15:07:20 +0400 Message-Id: <20200828110734.1638685-3-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@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=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 01:02:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- meson.build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meson.build b/meson.build index 74f8ea0c2e..2002728487 100644 --- a/meson.build +++ b/meson.build @@ -401,6 +401,11 @@ libdaxctl =3D not_found if 'CONFIG_LIBDAXCTL' in config_host libdaxctl =3D declare_dependency(link_args: config_host['LIBDAXCTL_LIBS'= ].split()) endif +tasn1 =3D not_found +if 'CONFIG_TASN1' in config_host + tasn1 =3D declare_dependency(compile_args: config_host['TASN1_CFLAGS'].s= plit(), + link_args: config_host['TASN1_LIBS'].split()) +endif =20 # Create config-host.h =20 --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598613024; cv=none; d=zohomail.com; s=zohoarc; b=YqIkf58mJNlAzW2jYoUb0HY+ycozFyJZb12ZEAx+a5kK0Wx91XnMzefBP5DQEbF6+J7Y9CdQ72kLHI0EguERDJQnol/0Z/gRIVnWIi4ir6dQFbpvWREn0HFEFjBS7MX6smETI6bRiXemVc6c58UZXSALjlzrINh5xQSX6N0WdeQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598613024; 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=o9ep1qptdjRM62QsjC9J4x0WFtrsIQZlAsBsgVFHHH4=; b=jvDBGupN8XYhM+lmmZpm9XchqTQ9dZgc4D/y1S4VHRsGQnyq8U7Wv/Ynj+/aHTXg1xGfNnbS7GuyNNSgLNe8jqyp+aBx1jifWnl0+ZMntoru+AaLPFpBLGjLVVzVN/GVBeS6Q5QPB8gg+XkDA1Jj8tfi2rsAGn2FrMp+jJCI3YU= 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 1598613024437889.6948971816458; Fri, 28 Aug 2020 04:10:24 -0700 (PDT) Received: from localhost ([::1]:41428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcH1-0006Ok-5P for importer@patchew.org; Fri, 28 Aug 2020 07:10:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcEv-0002Gq-2v for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22611 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcEt-0000Op-Ak for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:12 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-546-7jhYr3_iObiwYuYCcpButg-1; Fri, 28 Aug 2020 07:08:06 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C6C2F80EF84 for ; Fri, 28 Aug 2020 11:08:05 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id F2BBA5C1C2; Fri, 28 Aug 2020 11:08:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612888; 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=o9ep1qptdjRM62QsjC9J4x0WFtrsIQZlAsBsgVFHHH4=; b=IFtxl5NGsUeuWj1QjDOou0BCJZQp+DjJawsLUSp5DpF3tPU8Tzj0lAxG0An49qejASBoxP KCTsy6hmNME81gTJ5IpIObzrSoaoFovE9InZLuZIX7mzos8IswVSxLOpYZ2Y3Tq36I3GlG lNqLVjiUhyurUKT1WLLTlTlObBpdFv4= X-MC-Unique: 7jhYr3_iObiwYuYCcpButg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 03/16] meson: declare keyutils dependency Date: Fri, 28 Aug 2020 15:07:21 +0400 Message-Id: <20200828110734.1638685-4-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 04:08:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Rename the variable to be more explicit. A further clean-up patch will move the actual to dependency check to meson entirely. Signed-off-by: Marc-Andr=C3=A9 Lureau --- configure | 2 +- meson.build | 4 ++++ tests/Makefile.include | 2 +- tests/test-crypto-secret.c | 10 +++++----- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 12636369d1..2471483bec 100755 --- a/configure +++ b/configure @@ -7536,7 +7536,7 @@ fi if test "$secret_keyring" =3D "yes" ; then echo "CONFIG_SECRET_KEYRING=3Dy" >> $config_host_mak if test "$have_keyutils" =3D "yes" ; then - echo "CONFIG_TEST_SECRET_KEYRING=3Dy" >> $config_host_mak + echo "CONFIG_KEYUTILS=3Dy" >> $config_host_mak fi fi =20 diff --git a/meson.build b/meson.build index 2002728487..d69dd846d1 100644 --- a/meson.build +++ b/meson.build @@ -406,6 +406,10 @@ if 'CONFIG_TASN1' in config_host tasn1 =3D declare_dependency(compile_args: config_host['TASN1_CFLAGS'].s= plit(), link_args: config_host['TASN1_LIBS'].split()) endif +keyutils =3D not_found +if 'CONFIG_KEYUTILS' in config_host + keyutils =3D declare_dependency(link_args: '-lkeyutils') +endif =20 # Create config-host.h =20 diff --git a/tests/Makefile.include b/tests/Makefile.include index 9e72cfefbe..9599990a83 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -248,7 +248,7 @@ tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark= -crypto-cipher.o $(test-c tests/test-crypto-secret$(EXESUF): tests/test-crypto-secret.o $(test-crypt= o-obj-y) tests/test-crypto-xts$(EXESUF): tests/test-crypto-xts.o $(test-crypto-obj-= y) =20 -ifeq ($(CONFIG_TEST_SECRET_KEYRING),y) +ifeq ($(CONFIG_KEYUTILS),y) tests/test-crypto-secret.o-libs :=3D -lkeyutils endif =20 diff --git a/tests/test-crypto-secret.c b/tests/test-crypto-secret.c index 603a093f10..9d06176663 100644 --- a/tests/test-crypto-secret.c +++ b/tests/test-crypto-secret.c @@ -24,7 +24,7 @@ #include "crypto/secret.h" #include "qapi/error.h" #include "qemu/module.h" -#ifdef CONFIG_TEST_SECRET_KEYRING +#ifdef CONFIG_KEYUTILS #include "crypto/secret_keyring.h" #include #endif @@ -128,7 +128,7 @@ static void test_secret_indirect_emptyfile(void) g_free(fname); } =20 -#ifdef CONFIG_TEST_SECRET_KEYRING +#ifdef CONFIG_KEYUTILS =20 #define DESCRIPTION "qemu_test_secret" #define PAYLOAD "Test Payload" @@ -268,7 +268,7 @@ static void test_secret_keyring_bad_key_access_right(vo= id) keyctl_unlink(key, KEY_SPEC_PROCESS_KEYRING); } =20 -#endif /* CONFIG_TEST_SECRET_KEYRING */ +#endif /* CONFIG_KEYUTILS */ =20 static void test_secret_noconv_base64_good(void) { @@ -571,7 +571,7 @@ int main(int argc, char **argv) g_test_add_func("/crypto/secret/indirect/emptyfile", test_secret_indirect_emptyfile); =20 -#ifdef CONFIG_TEST_SECRET_KEYRING +#ifdef CONFIG_KEYUTILS g_test_add_func("/crypto/secret/keyring/good", test_secret_keyring_good); g_test_add_func("/crypto/secret/keyring/revoked_key", @@ -582,7 +582,7 @@ int main(int argc, char **argv) test_secret_keyring_bad_serial_key); g_test_add_func("/crypto/secret/keyring/bad_key_access_right", test_secret_keyring_bad_key_access_right); -#endif /* CONFIG_TEST_SECRET_KEYRING */ +#endif /* CONFIG_KEYUTILS */ =20 g_test_add_func("/crypto/secret/noconv/base64/good", test_secret_noconv_base64_good); --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598612964; cv=none; d=zohomail.com; s=zohoarc; b=iKfM2sHdXNkCXVfTOHAD/bM5EKeG9MqFRyHcMxMhsOLtXPPhFJ04Ry1JRG+n7FxATkYY+uDPMeTa1FU8ABcSjumJ0jQhb9ObvwFJdBCHYjSxLTqWQUNdvkYItwNh6vZuqCNITeKuYFfQJkmBIu0zoN5q+OGlwgFSv2ivGuTZSsQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598612964; 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=K4Sd4urd4/78OYOeMr4+d6SJ48/8cvfRv6qKwG++E0w=; b=g4DBhw8ToZh2KG6IqEzV5ugQ+HDZJ9P10CI6Lg9+l9qCt8oiMXkm1twFfzBrNTn2uzW061G/SL12AhNpwAjS3a/BPAwdjypGPeOsshb6oalh6013uanPPUwmShmvVUWFi2nHAD86Ox6bPKKL+TDHf6kZ9miOgcb4R8mjSSSVOyE= 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 1598612964857383.6937355363277; Fri, 28 Aug 2020 04:09:24 -0700 (PDT) Received: from localhost ([::1]:36302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcG3-0004ID-IF for importer@patchew.org; Fri, 28 Aug 2020 07:09:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcF3-0002Zf-Ck for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:21 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:39876 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcF1-0000Q0-Mi for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:21 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-69-uVHx-ZY9P0yqiwStwjVxMQ-1; Fri, 28 Aug 2020 07:08:17 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7C9851084CA1 for ; Fri, 28 Aug 2020 11:08:16 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3AB9C747BD; Fri, 28 Aug 2020 11:08:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612899; 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=K4Sd4urd4/78OYOeMr4+d6SJ48/8cvfRv6qKwG++E0w=; b=OG9xdzC3UwP0fs/juMswUkJuKeoP+Unkp2tQJU8V4hRPrZcmyYkE/XCqbUbMVqtkZqGbKt j2f/UlBxaow+jLwUSpTQL4qxPV6tu/0qeURub29Ewe/UYTRksM0wREECnd8EYOZhBqM9lv eIGyeXJ/j8e+pgODqLwWN/zy7GO8lG4= X-MC-Unique: uVHx-ZY9P0yqiwStwjVxMQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 04/16] meson: convert qht-bench Date: Fri, 28 Aug 2020 15:07:22 +0400 Message-Id: <20200828110734.1638685-5-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 01:02:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau This is required by test-qht-par unit test. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/Makefile.include | 1 - tests/meson.build | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 9599990a83..9751a86b4c 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -201,7 +201,6 @@ tests/test-rcu-slist$(EXESUF): tests/test-rcu-slist.o $= (test-util-obj-y) tests/test-qdist$(EXESUF): tests/test-qdist.o $(test-util-obj-y) tests/test-qht$(EXESUF): tests/test-qht.o $(test-util-obj-y) tests/test-qht-par$(EXESUF): tests/test-qht-par.o tests/qht-bench$(EXESUF)= $(test-util-obj-y) -tests/qht-bench$(EXESUF): tests/qht-bench.o $(test-util-obj-y) tests/test-bufferiszero$(EXESUF): tests/test-bufferiszero.o $(test-util-ob= j-y) tests/atomic_add-bench$(EXESUF): tests/atomic_add-bench.o $(test-util-obj-= y) tests/atomic64-bench$(EXESUF): tests/atomic64-bench.o $(test-util-obj-y) diff --git a/tests/meson.build b/tests/meson.build index 3c1586f110..c45ade551c 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,3 +1,7 @@ +qht_bench =3D executable('qht-bench', + sources: files('qht-bench.c'), + dependencies: [qemuutil]) + test_qapi_outputs =3D [ 'qapi-builtin-types.c', 'qapi-builtin-types.h', --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598613117; cv=none; d=zohomail.com; s=zohoarc; b=XJqpco/sgqJe6umP7d3iDVF6HZdA5a4l+Wvas9cor9+wKlnEh0NMHirDeWgROAa/PqwsK+55cAFUkID01Qyq+a8tnorlqORprGdMhFeiT7hV2k58NI/0UOruZZl5mde/Rvr8feXRVjKuE/9UICR9zCxFxquv5pJcdJsJtvtlP8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598613117; 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=Bnvr8uOKOauQCbTnPLPkhPxuzbtXtSkkBAEJQBvhUR8=; b=c7f/xYsP/Yh87/eJRehwgx9I0NwExekxs5IICSmHz4YGnkbugPGVhVwmzfGkDPkE8mFcVfgVflWZVkaMOfyr1QpB2lMu+qltiARiOzG6Ed7GoPkAmhCfgSJBMcInk3zCn+6gJ86v6xLa6rgRFf8jyQRiqD/dWK/toWceAqtG0RY= 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 1598613117678240.6396216150198; Fri, 28 Aug 2020 04:11:57 -0700 (PDT) Received: from localhost ([::1]:49660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcIW-0001Pm-Bm for importer@patchew.org; Fri, 28 Aug 2020 07:11:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcFF-00036f-Az for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39382) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcFD-0000R2-OF for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:33 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-85-ceNve3IZOJyKZlboYMgKBw-1; Fri, 28 Aug 2020 07:08:28 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D3079100746C for ; Fri, 28 Aug 2020 11:08:27 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A7415D9F1; Fri, 28 Aug 2020 11:08:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612910; 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=Bnvr8uOKOauQCbTnPLPkhPxuzbtXtSkkBAEJQBvhUR8=; b=VxfWBl0/kCbVSNWbrSdPiXzCSTctokG1GLHxAm8MQfQT/crGzh504KL5pxF+ZzB6kjgbgL GWXi54bCNBkAevgJy4sgUmAx1fUisB2R01JWYPJn6Kuw8uTAfVkndgNYFNtLlfHz9ptUem P8eB9/T53lhRCujfxF4fBk/yRurI1QQ= X-MC-Unique: ceNve3IZOJyKZlboYMgKBw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 05/16] tests: qga has virtio-serial by default when host has it Date: Fri, 28 Aug 2020 15:07:23 +0400 Message-Id: <20200828110734.1638685-6-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 02:09:03 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau When dumping the default configuration, don't expect virtio-serial as the configured method, unless the host has CONFIG_VIRTIO_SERIAL. Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/test-qga.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test-qga.c b/tests/test-qga.c index 4ac4c22109..122730d326 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -728,10 +728,12 @@ static void test_qga_config(gconstpointer data) g_assert_false(g_key_file_get_boolean(kf, "general", "daemon", &error)= ); g_assert_no_error(error); =20 +#ifdef CONFIG_VIRTIO_SERIAL str =3D g_key_file_get_string(kf, "general", "method", &error); g_assert_no_error(error); g_assert_cmpstr(str, =3D=3D, "virtio-serial"); g_free(str); +#endif =20 str =3D g_key_file_get_string(kf, "general", "path", &error); g_assert_no_error(error); --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598613036; cv=none; d=zohomail.com; s=zohoarc; b=KQXuKMZAMYRysTtf3fRCnlncKsB0PmpmCjxfiu2qVfqy8y9r0fFFKprzSwhCn1Ule8lZrn4b8EOdYzsDxBWS08eQThVBnfxQOooAVqOFz43gt503To4/DRV/Qf8smvD2mp3BRL94wFXIREKFzW626ZjuCAWFxXdNc9JRPBLLM4Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598613036; 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=FIudBb+hsDONga5vFs8w2/qC3JHh61JOjkyKp4sjiM4=; b=E6inx4dokdL+9D8Vyvuk5C4rasqG4N7JlZaT3qSa6eAW8wZ6Cro43SL8xUllOmO6MxJ/rqyvIJbevvu1PPcF17VGaKWpb1V5GCtMyE8nQ0pG0ncvSgFtTdfImWa1BJJWTtfDpViaowVUAIC0/yFzHniQw3H/53eLfkM7yf9KNU8= 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 1598613036317339.45637543838995; Fri, 28 Aug 2020 04:10:36 -0700 (PDT) Received: from localhost ([::1]:42520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcHC-0006q6-RL for importer@patchew.org; Fri, 28 Aug 2020 07:10:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcFV-0003Uz-27 for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:49 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:30031 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcFP-0000SS-MC for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:48 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-431-IotFuc0nNAOiUwXcM5P1HQ-1; Fri, 28 Aug 2020 07:08:38 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4E073425D3 for ; Fri, 28 Aug 2020 11:08:37 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33BF36198B; Fri, 28 Aug 2020 11:08:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612922; 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=FIudBb+hsDONga5vFs8w2/qC3JHh61JOjkyKp4sjiM4=; b=Oqym0cdWklYevf/goT8hPxAFGmH8x2c0/dYd+2PdcPGhN4lOdoUX6wVDTFednLNAOXyulF Tefr761X0+R6eIKEWxwVmgm2sPkv8wTE15dJeJkTo2UOFyghC6I8WR3EKyeSzmOcFk2uKw uHdDQl7OlGv/R4c23e0UHWUxUvjM0e8= X-MC-Unique: IotFuc0nNAOiUwXcM5P1HQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 06/16] meson: convert the unit tests Date: Fri, 28 Aug 2020 15:07:24 +0400 Message-Id: <20200828110734.1638685-7-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 01:02:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/Makefile.include | 256 +---------------------------------------- tests/meson.build | 169 +++++++++++++++++++++++++++ tests/test-qga.c | 2 +- 3 files changed, 173 insertions(+), 254 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 9751a86b4c..eea91772fa 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -38,256 +38,20 @@ export SRC_PATH SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ $(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak))) =20 -check-unit-y +=3D tests/check-qdict$(EXESUF) -check-unit-y +=3D tests/check-block-qdict$(EXESUF) -check-unit-y +=3D tests/check-qnum$(EXESUF) -check-unit-y +=3D tests/check-qstring$(EXESUF) -check-unit-y +=3D tests/check-qlist$(EXESUF) -check-unit-y +=3D tests/check-qnull$(EXESUF) -check-unit-y +=3D tests/check-qobject$(EXESUF) -check-unit-y +=3D tests/check-qjson$(EXESUF) -check-unit-y +=3D tests/check-qlit$(EXESUF) -check-unit-y +=3D tests/test-qobject-output-visitor$(EXESUF) -check-unit-y +=3D tests/test-clone-visitor$(EXESUF) -check-unit-y +=3D tests/test-qobject-input-visitor$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-qmp-cmds$(EXESUF) -check-unit-y +=3D tests/test-string-input-visitor$(EXESUF) -check-unit-y +=3D tests/test-string-output-visitor$(EXESUF) -check-unit-y +=3D tests/test-qmp-event$(EXESUF) -check-unit-y +=3D tests/test-opts-visitor$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-coroutine$(EXESUF) -check-unit-y +=3D tests/test-visitor-serialization$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-iov$(EXESUF) -check-unit-y +=3D tests/test-bitmap$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-aio$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-aio-multithread$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-throttle$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-thread-pool$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-hbitmap$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-bdrv-drain$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-bdrv-graph-mod$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-blockjob$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-blockjob-txn$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-block-backend$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-block-iothread$(EXESUF) -ifeq ($(CONFIG_POSIX),y) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-image-locking$(EXESUF) -endif -check-unit-y +=3D tests/test-x86-cpuid$(EXESUF) -# all code tested by test-x86-cpuid is inside topology.h -ifeq ($(CONFIG_SOFTMMU),y) -check-unit-y +=3D tests/test-xbzrle$(EXESUF) -check-unit-$(CONFIG_POSIX) +=3D tests/test-vmstate$(EXESUF) -endif -check-unit-y +=3D tests/test-cutils$(EXESUF) -check-unit-y +=3D tests/test-shift128$(EXESUF) -check-unit-y +=3D tests/test-mul64$(EXESUF) -check-unit-y +=3D tests/test-int128$(EXESUF) -# all code tested by test-int128 is inside int128.h -check-unit-y +=3D tests/rcutorture$(EXESUF) -check-unit-y +=3D tests/test-rcu-list$(EXESUF) -check-unit-y +=3D tests/test-rcu-simpleq$(EXESUF) -check-unit-y +=3D tests/test-rcu-tailq$(EXESUF) -check-unit-y +=3D tests/test-rcu-slist$(EXESUF) -check-unit-y +=3D tests/test-qdist$(EXESUF) -check-unit-y +=3D tests/test-qht$(EXESUF) -check-unit-y +=3D tests/test-qht-par$(EXESUF) -check-unit-y +=3D tests/test-bitops$(EXESUF) -check-unit-y +=3D tests/test-bitcnt$(EXESUF) -check-unit-y +=3D tests/test-qgraph$(EXESUF) -check-unit-y +=3D tests/check-qom-interface$(EXESUF) -check-unit-y +=3D tests/check-qom-proplist$(EXESUF) -check-unit-y +=3D tests/test-qemu-opts$(EXESUF) -check-unit-y +=3D tests/test-keyval$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-write-threshold$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-hash$(EXESUF) check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-hash$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-hmac$(EXESUF) check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-hmac$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-cipher$(EXESUF) check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-cipher$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-secret$(EXESUF) -check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) +=3D tests/test-c= rypto-tlscredsx509$(EXESUF) -check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) +=3D tests/test-c= rypto-tlssession$(EXESUF) -ifndef CONFIG_TSAN -# Some tests: test-char, test-qdev-global-props, and test-qga, -# are not runnable under TSan due to a known issue. -# https://github.com/google/sanitizers/issues/1116 -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-char$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-qdev-global-props$(EXESUF) -ifeq ($(CONFIG_GUEST_AGENT),y) -check-unit-$(call land,$(CONFIG_LINUX),$(CONFIG_VIRTIO_SERIAL)) +=3D tests= /test-qga$(EXESUF) -endif -endif -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-timed-average$(EXESUF) -check-unit-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_INOTIFY1)) +=3D tests/te= st-util-filemonitor$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-util-sockets$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-authz-simple$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-authz-list$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-authz-listfile$(EXESUF) -check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_AUTH_PAM)) +=3D tests/test= -authz-pam$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-task$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-channel-socket$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-channel-file$(EXESUF) -check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_GNUTLS)) +=3D tests/test-i= o-channel-tls$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-channel-command$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-io-channel-buffer$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-base64$(EXESUF) -check-unit-$(call land,$(CONFIG_BLOCK),$(if $(CONFIG_NETTLE),y,$(CONFIG_GC= RYPT))) +=3D tests/test-crypto-pbkdf$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-ivgen$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-afsplit$(EXESUF) -check-unit-$(call land,$(CONFIG_BLOCK),$(CONFIG_QEMU_PRIVATE_XTS)) +=3D te= sts/test-crypto-xts$(EXESUF) -check-unit-$(CONFIG_BLOCK) +=3D tests/test-crypto-block$(EXESUF) -check-unit-y +=3D tests/test-logging$(EXESUF) -check-unit-$(CONFIG_SOFTMMU) +=3D tests/test-bufferiszero$(EXESUF) -check-unit-y +=3D tests/test-uuid$(EXESUF) -check-unit-y +=3D tests/ptimer-test$(EXESUF) -check-unit-y +=3D tests/test-qapi-util$(EXESUF) -ifeq ($(CONFIG_BLOCK)$(CONFIG_REPLICATION)$(CONFIG_POSIX),yyy) -check-unit-y +=3D tests/test-replication$(EXESUF) -endif =20 QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest =20 - # Deps that are common to various different sets of tests below test-util-obj-y =3D libqemuutil.a -test-qom-obj-y =3D $(qom-obj-y) $(test-util-obj-y) -test-qapi-obj-y =3D $(test-qom-obj-y) tests/libtestqapi.a -benchmark-crypto-obj-$(CONFIG_BLOCK) =3D $(authz-obj-y) $(crypto-obj-y) $(= test-qom-obj-y) -test-crypto-obj-$(CONFIG_BLOCK) =3D $(authz-obj-y) $(crypto-obj-y) $(test-= qom-obj-y) -test-io-obj-$(CONFIG_BLOCK) =3D $(io-obj-y) $(test-crypto-obj-y) -test-authz-obj-$(CONFIG_BLOCK) =3D $(test-qom-obj-y) $(authz-obj-y) -test-block-obj-$(CONFIG_BLOCK) =3D $(block-obj-y) $(test-io-obj-y) tests/i= othread.o - -tests/check-qnum$(EXESUF): tests/check-qnum.o $(test-util-obj-y) -tests/check-qstring$(EXESUF): tests/check-qstring.o $(test-util-obj-y) -tests/check-qdict$(EXESUF): tests/check-qdict.o $(test-util-obj-y) -tests/check-block-qdict$(EXESUF): tests/check-block-qdict.o $(test-util-ob= j-y) -tests/check-qlist$(EXESUF): tests/check-qlist.o $(test-util-obj-y) -tests/check-qnull$(EXESUF): tests/check-qnull.o $(test-util-obj-y) -tests/check-qobject$(EXESUF): tests/check-qobject.o $(test-util-obj-y) -tests/check-qjson$(EXESUF): tests/check-qjson.o $(test-util-obj-y) -tests/check-qlit$(EXESUF): tests/check-qlit.o $(test-util-obj-y) -tests/check-qom-interface$(EXESUF): tests/check-qom-interface.o $(test-qom= -obj-y) -tests/check-qom-proplist$(EXESUF): tests/check-qom-proplist.o $(test-qom-o= bj-y) - -tests/test-char$(EXESUF): tests/test-char.o $(test-util-obj-y) $(test-io-o= bj-y) $(chardev-obj-y) tests/socket-helpers.o -tests/test-coroutine$(EXESUF): tests/test-coroutine.o $(test-block-obj-y) -tests/test-aio$(EXESUF): tests/test-aio.o $(test-block-obj-y) -tests/test-aio-multithread$(EXESUF): tests/test-aio-multithread.o $(test-b= lock-obj-y) -tests/test-throttle$(EXESUF): tests/test-throttle.o $(test-block-obj-y) -tests/test-bdrv-drain$(EXESUF): tests/test-bdrv-drain.o $(test-block-obj-y= ) $(test-util-obj-y) -tests/test-bdrv-graph-mod$(EXESUF): tests/test-bdrv-graph-mod.o $(test-blo= ck-obj-y) $(test-util-obj-y) -tests/test-blockjob$(EXESUF): tests/test-blockjob.o $(test-block-obj-y) $(= test-util-obj-y) -tests/test-blockjob-txn$(EXESUF): tests/test-blockjob-txn.o $(test-block-o= bj-y) $(test-util-obj-y) -tests/test-block-backend$(EXESUF): tests/test-block-backend.o $(test-block= -obj-y) $(test-util-obj-y) -tests/test-block-iothread$(EXESUF): tests/test-block-iothread.o $(test-blo= ck-obj-y) $(test-util-obj-y) -tests/test-image-locking$(EXESUF): tests/test-image-locking.o $(test-block= -obj-y) $(test-util-obj-y) -tests/test-thread-pool$(EXESUF): tests/test-thread-pool.o $(test-block-obj= -y) -tests/test-iov$(EXESUF): tests/test-iov.o $(test-util-obj-y) -tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y) $(tes= t-crypto-obj-y) -tests/test-bitmap$(EXESUF): tests/test-bitmap.o $(test-util-obj-y) -tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o -tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/libmigration.fa = $(test-util-obj-y) \ - $(test-io-obj-y) -tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o $(test-util-= obj-y) -tests/test-int128$(EXESUF): tests/test-int128.o -tests/rcutorture$(EXESUF): tests/rcutorture.o $(test-util-obj-y) -tests/test-rcu-list$(EXESUF): tests/test-rcu-list.o $(test-util-obj-y) -tests/test-rcu-simpleq$(EXESUF): tests/test-rcu-simpleq.o $(test-util-obj-= y) -tests/test-rcu-tailq$(EXESUF): tests/test-rcu-tailq.o $(test-util-obj-y) -tests/test-rcu-slist$(EXESUF): tests/test-rcu-slist.o $(test-util-obj-y) -tests/test-qdist$(EXESUF): tests/test-qdist.o $(test-util-obj-y) -tests/test-qht$(EXESUF): tests/test-qht.o $(test-util-obj-y) -tests/test-qht-par$(EXESUF): tests/test-qht-par.o tests/qht-bench$(EXESUF)= $(test-util-obj-y) -tests/test-bufferiszero$(EXESUF): tests/test-bufferiszero.o $(test-util-ob= j-y) tests/atomic_add-bench$(EXESUF): tests/atomic_add-bench.o $(test-util-obj-= y) tests/atomic64-bench$(EXESUF): tests/atomic64-bench.o $(test-util-obj-y) =20 -tests/test-qdev-global-props$(EXESUF): tests/test-qdev-global-props.o hw/c= ore/libhwcore.fa \ - $(test-qapi-obj-y) -tests/test-vmstate$(EXESUF): tests/test-vmstate.o migration/libmigration.f= a \ - $(test-io-obj-y) -tests/test-timed-average$(EXESUF): tests/test-timed-average.o $(test-util-= obj-y) -tests/test-base64$(EXESUF): tests/test-base64.o $(test-util-obj-y) -tests/ptimer-test$(EXESUF): tests/ptimer-test.o tests/ptimer-test-stubs.o = hw/core/ptimer.o -tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y) -tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-= qapi-obj-y) -tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(test-b= lock-obj-y) -tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y) -tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y) - -tests/test-logging$(EXESUF): tests/test-logging.o $(test-util-obj-y) - -tests/test-replication$(EXESUF): tests/test-replication.o $(test-util-obj-= y) \ - $(test-block-obj-y) - -tests/test-string-output-visitor$(EXESUF): tests/test-string-output-visito= r.o $(test-qapi-obj-y) -tests/test-string-input-visitor$(EXESUF): tests/test-string-input-visitor.= o $(test-qapi-obj-y) -tests/test-qmp-event$(EXESUF): tests/test-qmp-event.o $(test-qapi-obj-y) t= ests/test-qapi-emit-events.o tests/test-qapi-events.o -tests/test-qobject-output-visitor$(EXESUF): tests/test-qobject-output-visi= tor.o $(test-qapi-obj-y) -tests/test-clone-visitor$(EXESUF): tests/test-clone-visitor.o $(test-qapi-= obj-y) -tests/test-qobject-input-visitor$(EXESUF): tests/test-qobject-input-visito= r.o $(test-qapi-obj-y) -tests/test-qmp-cmds$(EXESUF): tests/test-qmp-cmds.o tests/test-qapi-comman= ds.o tests/test-qapi-init-commands.o $(test-qapi-obj-y) -tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serializatio= n.o $(test-qapi-obj-y) -tests/test-opts-visitor$(EXESUF): tests/test-opts-visitor.o $(test-qapi-ob= j-y) - -tests/test-shift128$(EXESUF): tests/test-shift128.o $(test-util-obj-y) -tests/test-mul64$(EXESUF): tests/test-mul64.o $(test-util-obj-y) -tests/test-bitops$(EXESUF): tests/test-bitops.o $(test-util-obj-y) -tests/test-bitcnt$(EXESUF): tests/test-bitcnt.o $(test-util-obj-y) -tests/test-qgraph$(EXESUF): tests/test-qgraph.o tests/qtest/libqos/qgraph.= o $(test-util-obj-y) -tests/test-crypto-hash$(EXESUF): tests/test-crypto-hash.o $(test-crypto-ob= j-y) tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test= -crypto-obj-y) -tests/test-crypto-hmac$(EXESUF): tests/test-crypto-hmac.o $(test-crypto-ob= j-y) tests/benchmark-crypto-hmac$(EXESUF): tests/benchmark-crypto-hmac.o $(test= -crypto-obj-y) -tests/test-crypto-cipher$(EXESUF): tests/test-crypto-cipher.o $(test-crypt= o-obj-y) tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark-crypto-cipher.o $(= test-crypto-obj-y) -tests/test-crypto-secret$(EXESUF): tests/test-crypto-secret.o $(test-crypt= o-obj-y) -tests/test-crypto-xts$(EXESUF): tests/test-crypto-xts.o $(test-crypto-obj-= y) - -ifeq ($(CONFIG_KEYUTILS),y) -tests/test-crypto-secret.o-libs :=3D -lkeyutils -endif - -tests/crypto-tls-x509-helpers.o-cflags :=3D $(TASN1_CFLAGS) -tests/crypto-tls-x509-helpers.o-libs :=3D $(TASN1_LIBS) -tests/pkix_asn1_tab.o-cflags :=3D $(TASN1_CFLAGS) - -tests/test-crypto-tlscredsx509.o-cflags :=3D $(TASN1_CFLAGS) -tests/test-crypto-tlscredsx509$(EXESUF): tests/test-crypto-tlscredsx509.o \ - tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o $(test-crypto-obj-y) - -tests/test-crypto-tlssession.o-cflags :=3D $(TASN1_CFLAGS) -tests/test-crypto-tlssession$(EXESUF): tests/test-crypto-tlssession.o \ - tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o \ - tests/crypto-tls-psk-helpers.o \ - $(test-crypto-obj-y) -tests/test-util-filemonitor$(EXESUF): tests/test-util-filemonitor.o \ - $(test-util-obj-y) -tests/test-util-sockets$(EXESUF): tests/test-util-sockets.o \ - tests/socket-helpers.o $(test-util-obj-y) -tests/test-authz-simple$(EXESUF): tests/test-authz-simple.o $(test-authz-o= bj-y) -tests/test-authz-list$(EXESUF): tests/test-authz-list.o $(test-authz-obj-y) -tests/test-authz-listfile$(EXESUF): tests/test-authz-listfile.o $(test-aut= hz-obj-y) -tests/test-authz-pam$(EXESUF): tests/test-authz-pam.o $(test-authz-obj-y) -tests/test-io-task$(EXESUF): tests/test-io-task.o $(test-io-obj-y) -tests/test-io-channel-socket$(EXESUF): tests/test-io-channel-socket.o \ - tests/io-channel-helpers.o tests/socket-helpers.o $(test-io-obj-y) -tests/test-io-channel-file$(EXESUF): tests/test-io-channel-file.o \ - tests/io-channel-helpers.o $(test-io-obj-y) -tests/test-io-channel-tls$(EXESUF): tests/test-io-channel-tls.o \ - tests/crypto-tls-x509-helpers.o tests/pkix_asn1_tab.o \ - tests/io-channel-helpers.o $(test-io-obj-y) -tests/test-io-channel-command$(EXESUF): tests/test-io-channel-command.o \ - tests/io-channel-helpers.o $(test-io-obj-y) -tests/test-io-channel-buffer$(EXESUF): tests/test-io-channel-buffer.o \ - tests/io-channel-helpers.o $(test-io-obj-y) -tests/test-crypto-pbkdf$(EXESUF): tests/test-crypto-pbkdf.o $(test-crypto-= obj-y) -tests/test-crypto-ivgen$(EXESUF): tests/test-crypto-ivgen.o $(test-crypto-= obj-y) -tests/test-crypto-afsplit$(EXESUF): tests/test-crypto-afsplit.o $(test-cry= pto-obj-y) -tests/test-crypto-block$(EXESUF): tests/test-crypto-block.o $(test-crypto-= obj-y) =20 tests/migration/stress$(EXESUF): tests/migration/stress.o $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"L= INK","$(TARGET_DIR)$@") @@ -301,8 +65,6 @@ tests/migration/initrd-stress.img: tests/migration/stres= s$(EXESUF) rm $(INITRD_WORK_DIR)/init rmdir $(INITRD_WORK_DIR) =20 -tests/test-qga$(EXESUF): qga/qemu-ga$(EXESUF) -tests/test-qga$(EXESUF): tests/test-qga.o tests/qtest/libqtest.o $(test-ut= il-obj-y) tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-ob= j-y) libvhost-user.a tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_s= cm_helper.o =20 @@ -343,19 +105,9 @@ define do_test_tap "TAP","$@") endef =20 -build-unit: $(check-unit-y) - -check-unit: $(check-unit-y) - $(call do_test_human, $^) - check-speed: $(check-speed-y) $(call do_test_human, $^) =20 -# gtester tests with TAP output - -check-report-unit.tap: $(check-unit-y) - $(call do_test_tap,$^) - # Per guest TCG tests =20 BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) @@ -449,16 +201,14 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get= -vm-images =20 # Consolidated targets =20 -.PHONY: check-block check-unit check check-clean get-vm-images +.PHONY: check-block check check-clean get-vm-images check-block: -check-build: build-unit +check-build: =20 check-clean: - rm -rf $(check-unit-y) tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) + rm -rf tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) rm -rf $(TESTS_VENV_DIR) $(TESTS_RESULTS_DIR) =20 -check: check-unit - clean: check-clean =20 # Build the help program automatically diff --git a/tests/meson.build b/tests/meson.build index c45ade551c..6b04171c17 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,3 +1,5 @@ +py3 =3D import('python').find_installation() + qht_bench =3D executable('qht-bench', sources: files('qht-bench.c'), dependencies: [qemuutil]) @@ -46,6 +48,173 @@ test_qapi_files =3D custom_target('Test QAPI files', libtestqapi =3D static_library('testqapi', sources: [test_qapi_files, test= _qapi_outputs_extra]) testqapi =3D declare_dependency(link_with: libtestqapi) =20 +testblock =3D declare_dependency(dependencies: [block], sources: files('io= thread.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': {'deps': [testqapi]}, + 'test-clone-visitor': {'deps': [testqapi]}, + 'test-qobject-input-visitor': {'deps': [testqapi]}, + 'test-string-input-visitor': {'deps': [testqapi]}, + 'test-string-output-visitor': {'deps': [testqapi]}, + 'test-qmp-event': {'deps': [testqapi]}, + 'test-opts-visitor': {'deps': [testqapi]}, + 'test-visitor-serialization': {'deps': [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-qht-par': {'test_deps': [qht_bench]}, + 'test-bitops': {}, + 'test-bitcnt': {}, + 'test-qgraph': {'extra_src': files('qtest/libqos/qgraph.c')}, + 'check-qom-interface': {'deps': [qom]}, + 'check-qom-proplist': {'deps': [qom]}, + 'test-qemu-opts': {}, + 'test-keyval': {'deps': [testqapi]}, + 'test-logging': {}, + 'test-uuid': {}, + 'ptimer-test': { + 'extra_src': files('ptimer-test-stubs.c', meson.source_root() / 'hw/co= re/ptimer.c')}, + 'test-qapi-util': {}, +} + +if have_block + tests +=3D { + 'test-coroutine': {'deps': [testblock]}, + 'test-aio': {'deps': [testblock]}, + 'test-aio-multithread': {'deps': [testblock]}, + 'test-throttle': {'deps': [testblock]}, + 'test-thread-pool': {'deps': [testblock]}, + 'test-hbitmap': {'deps': [testblock]}, + 'test-bdrv-drain': {'deps': [testblock]}, + 'test-bdrv-graph-mod': {'deps': [testblock]}, + 'test-blockjob': {'deps': [testblock]}, + 'test-blockjob-txn': {'deps': [testblock]}, + 'test-block-backend': {'deps': [testblock]}, + 'test-block-iothread': {'deps': [testblock]}, + 'test-image-locking': {'deps': [testblock], 'if': ['CONFIG_POSIX']}, + 'test-write-threshold': {'deps': [testblock]}, + 'test-crypto-hash': {'deps': [crypto]}, + 'test-crypto-hmac': {'deps': [crypto]}, + 'test-crypto-cipher': {'deps': [crypto]}, + 'test-crypto-secret': {'deps': [crypto, keyutils]}, + 'test-crypto-tlscredsx509': { + 'extra_src': files('crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c'), + 'deps': [tasn1, crypto], + 'if': ['CONFIG_GNUTLS', 'CONFIG_TASN1']}, + 'test-crypto-tlssession': { + 'extra_src': files('crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c', '= crypto-tls-psk-helpers.c'), + 'deps': [tasn1, crypto], + 'if': ['CONFIG_GNUTLS', 'CONFIG_TASN1']}, + 'test-authz-simple': {'deps': [authz]}, + 'test-authz-list': {'deps': [authz]}, + 'test-authz-listfile': {'deps': [authz]}, + 'test-authz-pam': {'deps': [authz], 'if': ['CONFIG_AUTH_PAM']}, + 'test-io-task': {'deps': [testblock]}, + 'test-io-channel-socket': { + 'extra_src': files('socket-helpers.c', 'io-channel-helpers.c'), + 'deps': [io]}, + 'test-io-channel-file': { + 'extra_src': files('io-channel-helpers.c'), + 'deps': [io]}, + 'test-io-channel-tls': { + 'extra_src': files('io-channel-helpers.c', 'crypto-tls-x509-helpers.= c', 'pkix_asn1_tab.c'), + 'deps': [tasn1, io, crypto], + 'if': ['CONFIG_GNUTLS', 'CONFIG_TASN1']}, + 'test-io-channel-command': { + 'extra_src': files('io-channel-helpers.c'), + 'deps': [io]}, + 'test-io-channel-buffer': { + 'extra_src': files('io-channel-helpers.c'), + 'deps': [io]}, + 'test-crypto-ivgen': {'deps': [io]}, + 'test-crypto-afsplit': {'deps': [io]}, + 'test-crypto-xts': {'deps': [crypto, io], 'if': ['CONFIG_QEMU_PRIVATE_= XTS']}, + 'test-crypto-block': {'deps': [io]}, + 'test-replication': {'deps': [testblock], 'if': ['CONFIG_REPLICATION',= 'CONFIG_POSIX']}, + } + if 'CONFIG_NETTLE' in config_host or 'CONFIG_GCRYPT' in config_host + tests +=3D {'test-crypto-pbkdf': {'deps': [io]}} + endif +endif + +if have_system + tests +=3D { + 'test-iov': {}, + 'test-qmp-cmds': {'deps': [testqapi]}, + 'test-xbzrle': {'deps': [migration]}, + 'test-vmstate': {'deps': [migration, io], 'if': ['CONFIG_POSIX']}, + 'test-timed-average': {}, + 'test-util-filemonitor': {'if': ['CONFIG_INOTIFY1']}, + 'test-util-sockets': {'extra_src': files('socket-helpers.c')}, + 'test-base64': {}, + 'test-bufferiszero': {}, + } + # Some tests: test-char, test-qdev-global-props, and test-qga, + # are not runnable under TSan due to a known issue. + # https://github.com/google/sanitizers/issues/1116 + if 'CONFIG_TSAN' not in config_host + tests +=3D { + 'test-char': {'extra_src': files('socket-helpers.c'), 'deps': [qom, = io, chardev]}, + 'test-qdev-global-props': {'deps': [qom, hwcore, testqapi]} + } + endif +endif + +if 'CONFIG_TSAN' not in config_host and 'CONFIG_GUEST_AGENT' in config_host + tests +=3D {'test-qga': {'extra_src': files('qtest/libqtest.c'), 'test_d= eps': [qga], 'if': ['CONFIG_GUEST_AGENT', 'CONFIG_LINUX']}} +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()) + +foreach test_name, extra_args: tests + check_if =3D true + foreach t: extra_args.get('if', []) + if t not in config_host + check_if =3D false + break + endif + endforeach + if not check_if + continue + endif + + src =3D extra_args.get('src', [test_name + '.c']) + extra_src =3D extra_args.get('extra_src', []) + exe =3D executable(test_name, src + extra_src, + dependencies: [qemuutil] + extra_args.get('deps', [])) + + suite =3D ['unit'] + extra_args.get('suite', []) + test(test_name, exe, + depends: extra_args.get('test_deps', []), + env: test_env, + args: ['--tap', '-k'], + protocol: 'tap', + suite: suite) +endforeach + if have_system and 'CONFIG_POSIX' in config_host subdir('qemu-iotests') endif diff --git a/tests/test-qga.c b/tests/test-qga.c index 122730d326..1e223e992c 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -4,7 +4,7 @@ #include #include =20 -#include "libqos/libqtest.h" +#include "qtest/libqos/libqtest.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" =20 --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598613133; cv=none; d=zohomail.com; s=zohoarc; b=EGfGrWKTvZM3pdgO8fAALXuItzlkOE2JoyqhVRqkUOQnJoFhUZTltqlvd9639AVdH55f8wO8naNfIYOqpAfuUxMw6zPwpcheCbUnzL904T4fpdVUuVF0mOLBKHPLl5h7nHDRdQR1gUby32q1hnNDn8ta2HRmdI3/vJitBh0XkA4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598613133; 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=PMzYvH/XagGy2DlxTxsTL5VV0dnEH9JusMzgMwaZZqQ=; b=N3jzArqox3JQ++RdA3g/kOsPR6hLItCA5ajzsvFI5IIgzGSEmshbMN56ZJOLRXAwBBL7j+SycvLzZORrNtHXp69/cLl8G+n9+5j+QC+wd6g14Zkcu8mYewFQ/oN8TifmV98XucF8GPRussQ1mQy79VZGjfULqs7Tx7CJGyiuf4s= 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 1598613133929259.4937758548407; Fri, 28 Aug 2020 04:12:13 -0700 (PDT) Received: from localhost ([::1]:50968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcIm-0001wg-JC for importer@patchew.org; Fri, 28 Aug 2020 07:12:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39604) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcFX-0003Z7-Dt for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:51 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:26864 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcFU-0000So-O1 for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:51 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-388-stAQCPwvOXakvnclZTm8Bg-1; Fri, 28 Aug 2020 07:08:45 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BCB7A88127C for ; Fri, 28 Aug 2020 11:08:44 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 116467D4F6; Fri, 28 Aug 2020 11:08:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612927; 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=PMzYvH/XagGy2DlxTxsTL5VV0dnEH9JusMzgMwaZZqQ=; b=EV6Rx5zkLtSTdXn6mKLVi+q2MU/YgWNQd6On7glMPzb3nDA2agRMvcBQq2z3zC6JnjBd4N bPfBniVbDMT7DjcSRR9grZ1Xi/DI8Rs7FLttLoCJXnTKTWDNqpEIPCO4FpUazC0lQaZhWg Tplr+XOT05+ct2HstuH6bleDy70gkb0= X-MC-Unique: stAQCPwvOXakvnclZTm8Bg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 07/16] meson: move keyutils dependency check Date: Fri, 28 Aug 2020 15:07:25 +0400 Message-Id: <20200828110734.1638685-8-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 07:07:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Since there is not minimum version specified, and it's a test-only dependency, it's fair to depend on a version that ships with a .pc I suppose. Signed-off-by: Marc-Andr=C3=A9 Lureau --- configure | 25 ------------------------- meson.build | 6 ++---- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/configure b/configure index 2471483bec..cb81fbc9b3 100755 --- a/configure +++ b/configure @@ -6324,28 +6324,6 @@ but not implemented on your system" fi fi =20 -########################################## -# check for usable keyutils.h - -if test "$linux" =3D "yes" ; then - - have_keyutils=3Dno - cat > $TMPC << EOF -#include -#include -#include -#include -#include -int main(void) { - return request_key("user", NULL, NULL, 0); -} -EOF - if compile_prog "" "-lkeyutils"; then - have_keyutils=3Dyes - fi -fi - - ########################################## # End of CC checks # After here, no more $cc or $ld runs @@ -7535,9 +7513,6 @@ fi =20 if test "$secret_keyring" =3D "yes" ; then echo "CONFIG_SECRET_KEYRING=3Dy" >> $config_host_mak - if test "$have_keyutils" =3D "yes" ; then - echo "CONFIG_KEYUTILS=3Dy" >> $config_host_mak - fi fi =20 if test "$tcg_interpreter" =3D "yes"; then diff --git a/meson.build b/meson.build index d69dd846d1..421f53083e 100644 --- a/meson.build +++ b/meson.build @@ -406,10 +406,7 @@ if 'CONFIG_TASN1' in config_host tasn1 =3D declare_dependency(compile_args: config_host['TASN1_CFLAGS'].s= plit(), link_args: config_host['TASN1_LIBS'].split()) endif -keyutils =3D not_found -if 'CONFIG_KEYUTILS' in config_host - keyutils =3D declare_dependency(link_args: '-lkeyutils') -endif +keyutils =3D dependency('keyutils', required: false) =20 # Create config-host.h =20 @@ -420,6 +417,7 @@ config_host_data.set('CONFIG_VNC_JPEG', jpeg.found()) config_host_data.set('CONFIG_VNC_PNG', png.found()) config_host_data.set('CONFIG_VNC_SASL', sasl.found()) config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found()) +config_host_data.set('CONFIG_KEYUTILS', keyutils.found()) config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version(= ))) config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('= .')[0]) config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('= .')[1]) --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598613216; cv=none; d=zohomail.com; s=zohoarc; b=lxK8BAwHuQtubixfpH70QDa6jTziHKwpIpkU74yTaFVOo4CzTv4p3aIrI04P2gurlzlfNxoP0OMu8AuDv4NvdBBNnc/rOrwKMtjcbD6Z7Y352YzhwZyjd36NOEne2kw7/T4pEEos/4ZPgOq9Y5iDNYyFh/cco1PPXBPwqfvirX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598613216; 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=D67rxr493mJ/+CrDQejHYaadXcG/Kd/ccjywrf2LIbs=; b=I0r/Bm1eHneT2KpAg4WSTt7zZT9ZuMzfshsTTUqG3Cprf3NBO5dSxPiTZvq85xQtC//TrMdvxJWnfzcC9URMDR/ZjaWP2VPfVsHycvra3w64UqCIXyrmRAO+vwxZWxLj4WxIQyJReCA83gfMZLGWjVy4yhqVi/osVyq5JDs0Wb4= 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 1598613216334135.3621336000566; Fri, 28 Aug 2020 04:13:36 -0700 (PDT) Received: from localhost ([::1]:57828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcK7-0004ic-1U for importer@patchew.org; Fri, 28 Aug 2020 07:13:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcFe-0003sN-B9 for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:58 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:48095 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcFc-0000Tl-HM for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:08:57 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-559-f_xT4PWgONipY9p6DLRxPQ-1; Fri, 28 Aug 2020 07:08:53 -0400 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 DDAEC100746C for ; Fri, 28 Aug 2020 11:08:52 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B34119C59; Fri, 28 Aug 2020 11:08:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612935; 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=D67rxr493mJ/+CrDQejHYaadXcG/Kd/ccjywrf2LIbs=; b=ZEXbZhTCfg0npfg82KO8oCdYkt8CcNssBhLhCQZWt7xoIcVzMfn2jhq5/jY2t9lnQ82Z8a j3xXJL3zCp1tr3ydoTaE8bdnIlR0krrkZtpBTjJ+XZIjgztOkBXIqEdIxRiTs2D2oYKm0p dUtMkd8xxtKj4+wJVsKQ71gWyptmLxI= X-MC-Unique: f_xT4PWgONipY9p6DLRxPQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 08/16] meson: remove old socket_scm_helper rule Date: Fri, 28 Aug 2020 15:07:26 +0400 Message-Id: <20200828110734.1638685-9-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@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=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 00:28:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau It was covered already in commit d3ca592b3c10 ("meson: convert check-block") Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/Makefile.include | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index eea91772fa..2a6f29d1b5 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -66,7 +66,6 @@ tests/migration/initrd-stress.img: tests/migration/stress= $(EXESUF) rmdir $(INITRD_WORK_DIR) =20 tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-ob= j-y) libvhost-user.a -tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_s= cm_helper.o =20 SPEED =3D quick =20 --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598613015; cv=none; d=zohomail.com; s=zohoarc; b=c4HsMRG4mLqHuBHLzUUHL2i6QWZVAQQPdGJNCpj4ZI4ABshVUPhGmmAzmUjkAuIGuApdEmz2iV5G3HWqDtjhevBjUvP/Cv5y+PAbzbpC5l9S2e6RNdxuQnWWHpPckGOLXTmStWjiT+ntU+CVnufiG0TgoM4TzX7Tr2+zIApR4JE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598613015; 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=/LuWpvFTPyg+qqsTqB2meeNRwdrmajd864pjvgQdDqU=; b=UvKRLsit8JSU6jPzsUzoGKWTd+y6T6VXZlV2zieCKRE+nHl2xZq2DP+cRljDGc4Tr5/Zr4T0LjZo14pzApTws1xMJYbYyhvMlbUiZ4p+ZlbWdigBrv8nvhUruEoBVwAtkwmKS+KxwnYymZdHaVpCyMWvXvFFo4KpdNpYZoS1Ia4= 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 15986130150071.3586330795440063; Fri, 28 Aug 2020 04:10:15 -0700 (PDT) Received: from localhost ([::1]:40426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcGr-0005zG-Gv for importer@patchew.org; Fri, 28 Aug 2020 07:10:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcFl-0004BV-Kk for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:05 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:45868 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcFj-0000VX-SF for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:05 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-245-kqcD_fDnPoSWC5HufAu3fg-1; Fri, 28 Aug 2020 07:09:01 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7648418A2251 for ; Fri, 28 Aug 2020 11:09:00 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id C972A10021AA; Fri, 28 Aug 2020 11:08:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612943; 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=/LuWpvFTPyg+qqsTqB2meeNRwdrmajd864pjvgQdDqU=; b=M6Ys5kAV6GXtFJjOU/g6LnwBdiU7l4AY8i+whWi3q12XuTlxzLV0EDGlIE5TXVrjYpUx50 Ga6cgvoW0O5/PbUnJc6shtuwfTtTLYLJP/tuVaJgBPf9GdUMqomy8X9imGbj6cnNmEFXRm ozP8Ridnz9feICKQ7K+WdDatZVPrLuM= X-MC-Unique: kqcD_fDnPoSWC5HufAu3fg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 09/16] meson: convert vhost-user-bridge Date: Fri, 28 Aug 2020 15:07:27 +0400 Message-Id: <20200828110734.1638685-10-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 01:02:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/Makefile.include | 2 -- tests/meson.build | 9 +++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 2a6f29d1b5..d4635f9b5b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -65,8 +65,6 @@ tests/migration/initrd-stress.img: tests/migration/stress= $(EXESUF) rm $(INITRD_WORK_DIR)/init rmdir $(INITRD_WORK_DIR) =20 -tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-ob= j-y) libvhost-user.a - SPEED =3D quick =20 # gtester tests, possibly with verbose output diff --git a/tests/meson.build b/tests/meson.build index 6b04171c17..180011445d 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -215,6 +215,15 @@ foreach test_name, extra_args: tests suite: suite) endforeach =20 + +if have_tools and 'CONFIG_VHOST_USER' in config_host + executable('vhost-user-bridge', + sources: files('vhost-user-bridge.c'), + link_with: [libvhost_user], + dependencies: [qemuutil], + build_by_default: false) +endif + if have_system and 'CONFIG_POSIX' in config_host subdir('qemu-iotests') endif --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598613065; cv=none; d=zohomail.com; s=zohoarc; b=EIIsLEnUvW7Zmyb7oq6QRwG2HD/YWywfIb1+965I7aXYtsQOTdXvHwcvaWijHqEO+RHGsB4Um3lnhkGy8VeeZtKlZIYZJk2IHlyFQlB/XVNCFOceIe2qVXQ/a1gVDqN1V0g3KpsBhDXqnkJC0QU4UKwvx2xTTZUuAYccDAOwbHE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598613065; 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=Mb2pe8Oh1l6P9QXYaCLrdWlknUwZBcxH34qsyj6j1Sc=; b=Mrvu2qybfHmOHAX41m7DJJJEiqiNyXsnT7QVTzGe+8TYGQGhTCCfIuTmabihkapIEwPp/ZDKV7oS4BvCqi3/aqZQrm6VdfK1Gy6J6RNXhT9cQeOs5s2qpq1rPNbKhGACJn0oZimLQg7tDkQeR3W5o/P1BBLyd2yuUHD5bkxuayQ= 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 1598613065283326.3458305278871; Fri, 28 Aug 2020 04:11:05 -0700 (PDT) Received: from localhost ([::1]:44538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcHf-0007fT-RO for importer@patchew.org; Fri, 28 Aug 2020 07:11:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcFx-0004hO-Dn for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:33966) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcFv-0000Xt-NQ for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:17 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-305-ZjoAjTeDOzGA2xfzIkNBkA-1; Fri, 28 Aug 2020 07:09:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C7A6873073 for ; Fri, 28 Aug 2020 11:09:12 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A8E75D9F3; Fri, 28 Aug 2020 11:09:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612954; 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=Mb2pe8Oh1l6P9QXYaCLrdWlknUwZBcxH34qsyj6j1Sc=; b=HbR9XuZWpG26DnYGOGGQn9dH2ckC4Ayyxbugr/evpX1C0f1XeDNvfB2nuWVb3K579lx03c 9dLpw6VkP+VE78r8S1EWpnN2nJOc2oPsMMftPdhAijKWUUfwMFvvZ7JUuJBCrHyoGX5VsU Vyhfis8rfIeKrOSzgj0MqEMI8Qrhn0k= X-MC-Unique: ZjoAjTeDOzGA2xfzIkNBkA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 10/16] meson: convert atomic*-bench Date: Fri, 28 Aug 2020 15:07:28 +0400 Message-Id: <20200828110734.1638685-11-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.001 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=216.205.24.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 02:09:03 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/Makefile.include | 5 ----- tests/meson.build | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index d4635f9b5b..30de192567 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -44,11 +44,6 @@ check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-= cipher$(EXESUF) =20 QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest =20 -# Deps that are common to various different sets of tests below -test-util-obj-y =3D libqemuutil.a -tests/atomic_add-bench$(EXESUF): tests/atomic_add-bench.o $(test-util-obj-= y) -tests/atomic64-bench$(EXESUF): tests/atomic64-bench.o $(test-util-obj-y) - tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test= -crypto-obj-y) tests/benchmark-crypto-hmac$(EXESUF): tests/benchmark-crypto-hmac.o $(test= -crypto-obj-y) tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark-crypto-cipher.o $(= test-crypto-obj-y) diff --git a/tests/meson.build b/tests/meson.build index 180011445d..a2902bde45 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -4,6 +4,16 @@ qht_bench =3D executable('qht-bench', sources: files('qht-bench.c'), dependencies: [qemuutil]) =20 +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) + test_qapi_outputs =3D [ 'qapi-builtin-types.c', 'qapi-builtin-types.h', --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598613298; cv=none; d=zohomail.com; s=zohoarc; b=liIf/lBc8cDzMRQUoYsDDKvqaY9BxAkr9gE6kIweGDVcNkuej+rGIFU/Q2UePry1vABQy2lYo3m0NQJjh+ZacxR1Opp9c/tTAu+HBuWumpV28CkcCg6eo+GJ44aKH8Sjd27n4fbUNEfrZmL45sVYcvN3Ppw9JcXzKM0t9YPWUc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598613298; 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=kRd0J17TL3EKWjtslK7HZu1toRTuXcADnLWsSeDYb0Y=; b=VAtMg9y/78xF3CLiijoHlTG4DsWO9WlIsWgwt9T18Or4RymVRLmimHGwzq5qAQZy1ndwsx7mG2Pbm9ewinBLWUH/R+OKUTc2+VRkZNTdSosHs/aCbAjK2gsAEdfJW2dbtZQncjW1w7uzX67Isxjw+sm05P9l2SQkn5gc7TlYPpk= 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 1598613298688495.376885232369; Fri, 28 Aug 2020 04:14:58 -0700 (PDT) Received: from localhost ([::1]:36792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcLR-0007cv-Et for importer@patchew.org; Fri, 28 Aug 2020 07:14:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcG5-00051x-8l for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:25 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:31126 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcG3-0000Zl-Gp for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:24 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-493-Mff-Y03tOWGDB5ioY-4YmQ-1; Fri, 28 Aug 2020 07:09:21 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 26AAA100746C for ; Fri, 28 Aug 2020 11:09:20 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 634385C1C2; Fri, 28 Aug 2020 11:09:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612962; 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=kRd0J17TL3EKWjtslK7HZu1toRTuXcADnLWsSeDYb0Y=; b=MgrGKbIW8pUdlrcrba5Z4GPG3khTSNTdve8Q/Ykm3QuKJIKow/ciMFM55g5J6rUXOHp7yF poRfuONxbhUMCj1HCXZpTuV+42C3gKPXhXQXWFgbfNJg4Sjt8XKe9mQeL1zeyKVa+h1TP/ 2HXE+JZ0jS+aJJ5+R3bHyxDRp2dnrKI= X-MC-Unique: Mff-Y03tOWGDB5ioY-4YmQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 11/16] tests/Makefile.include: update check-build Date: Fri, 28 Aug 2020 15:07:29 +0400 Message-Id: <20200828110734.1638685-12-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 01:02:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/Makefile.include | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 30de192567..9fb61ff900 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -23,7 +23,7 @@ endif @echo " $(MAKE) check-clean Clean the tests and related data" @echo @echo "The following are useful for CI builds" - @echo " $(MAKE) check-build Build most test binaris" + @echo " $(MAKE) check-build Build most test binaries" @echo " $(MAKE) get-vm-images Downloads all images used by accepta= nce tests, according to configured targets (~350 MB each, 1.5 GB max)" @echo @echo @@ -195,7 +195,6 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-v= m-images =20 .PHONY: check-block check check-clean get-vm-images check-block: -check-build: =20 check-clean: rm -rf tests/*.o tests/*/*.o $(QEMU_IOTESTS_HELPERS-y) --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598613167; cv=none; d=zohomail.com; s=zohoarc; b=Ob6Dz9x3G2uJNrJQjfKMqVH+uG5KIj8/4giAdW2IAcOp8cyJHytvtJimVMQflBvcFLbccfEIHTB8AKzWTvkSwdtGC2C05Wtg9o59qZKGEd3GtsamoCYP2FhH740/LPQn5xx2YWcNuyr4QYPA642TUKrEH1y84g1eW3PxnwP6oFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598613167; 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=0uXV+T/HYmL2WGCSQbjUYrOSpkTcCjueGq8gGiNN3NQ=; b=Gg7Y9YKj/DqGSUUdOf7J5DX5xUR4ryAz9h79R8Jb7S0TnXry2XGz8SWEceWQHo7DfbETfoEPBcw9F+KxsztcEnUuRAvtEjbtM0TBfnzecdOxx/K4EAOcHhG4dW9fBZMDqK1u9IoLoziuoc3jts/wHV/7nNYKd0nwfY8ELe1QKt4= 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 1598613167507672.5060695862147; Fri, 28 Aug 2020 04:12:47 -0700 (PDT) Received: from localhost ([::1]:53426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcJK-0002wB-85 for importer@patchew.org; Fri, 28 Aug 2020 07:12:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcGC-0005Cl-Sh for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:32 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:23997 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcGA-0000bm-SR for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:32 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-450-Io7p_g0NOyaPebPXzdr4oQ-1; Fri, 28 Aug 2020 07:09:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 56F951074650 for ; Fri, 28 Aug 2020 11:09:27 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id DAB5774E1E; Fri, 28 Aug 2020 11:09:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612969; 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=0uXV+T/HYmL2WGCSQbjUYrOSpkTcCjueGq8gGiNN3NQ=; b=G4hwFlYgH359/wwCi3PGn+AyuE4qSV6kma9mNn64qNgOJpk/zg55UmyVj/cxIRpX/MeYmF //a3UzgVJXuMN8jnOYM3PznalpSKkVsV2FowT177X1MmthZY9g3OXs42ZIpH+xBf52w5UE zJKVMZeF/qeKXWDih9J2aLK9DVH4KVY= X-MC-Unique: Io7p_g0NOyaPebPXzdr4oQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 12/16] tests: do not print benchmark output to stdout Date: Fri, 28 Aug 2020 15:07:30 +0400 Message-Id: <20200828110734.1638685-13-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 07:07:45 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau As this makes the TAP output invalid. Use g_test_message(). Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/benchmark-crypto-cipher.c | 8 ++++---- tests/benchmark-crypto-hash.c | 2 +- tests/benchmark-crypto-hmac.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/benchmark-crypto-cipher.c b/tests/benchmark-crypto-ciphe= r.c index 53032334ec..1936aa4ae0 100644 --- a/tests/benchmark-crypto-cipher.c +++ b/tests/benchmark-crypto-cipher.c @@ -70,8 +70,8 @@ static void test_cipher_speed(size_t chunk_size, } g_test_timer_elapsed(); =20 - g_print("Enc chunk %zu bytes ", chunk_size); - g_print("%.2f MB/sec ", (double)total / MiB / g_test_timer_last()); + g_test_message("Enc chunk %zu bytes ", chunk_size); + g_test_message("%.2f MB/sec ", (double)total / MiB / g_test_timer_last= ()); =20 g_test_timer_start(); remain =3D total; @@ -85,8 +85,8 @@ static void test_cipher_speed(size_t chunk_size, } g_test_timer_elapsed(); =20 - g_print("Dec chunk %zu bytes ", chunk_size); - g_print("%.2f MB/sec ", (double)total / MiB / g_test_timer_last()); + g_test_message("Dec chunk %zu bytes ", chunk_size); + g_test_message("%.2f MB/sec ", (double)total / MiB / g_test_timer_last= ()); =20 qcrypto_cipher_free(cipher); g_free(plaintext); diff --git a/tests/benchmark-crypto-hash.c b/tests/benchmark-crypto-hash.c index d16837d00a..598111e75a 100644 --- a/tests/benchmark-crypto-hash.c +++ b/tests/benchmark-crypto-hash.c @@ -48,7 +48,7 @@ static void test_hash_speed(const void *opaque) } g_test_timer_elapsed(); =20 - g_print("%.2f MB/sec ", (double)total / MiB / g_test_timer_last()); + g_test_message("%.2f MB/sec ", (double)total / MiB / g_test_timer_last= ()); =20 g_free(out); g_free(in); diff --git a/tests/benchmark-crypto-hmac.c b/tests/benchmark-crypto-hmac.c index f1dfa240cb..f9fa22df95 100644 --- a/tests/benchmark-crypto-hmac.c +++ b/tests/benchmark-crypto-hmac.c @@ -55,10 +55,10 @@ static void test_hmac_speed(const void *opaque) } while (g_test_timer_elapsed() < 5.0); =20 total /=3D MiB; - g_print("hmac(sha256): "); - g_print("Testing chunk_size %zu bytes ", chunk_size); - g_print("done: %.2f MB in %.2f secs: ", total, g_test_timer_last()); - g_print("%.2f MB/sec\n", total / g_test_timer_last()); + g_test_message("hmac(sha256): "); + g_test_message("Testing chunk_size %zu bytes ", chunk_size); + g_test_message("done: %.2f MB in %.2f secs: ", total, g_test_timer_las= t()); + g_test_message("%.2f MB/sec\n", total / g_test_timer_last()); =20 g_free(out); g_free(in); --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598613264; cv=none; d=zohomail.com; s=zohoarc; b=C09LmMOT6GCBnqncL2P/oYCtbz+b9wmdvjoaLUjMhUneUBNcUSer+MC988KNaSRX/WJo2laOJag6/WjyIG2pCp6nnWyf0uObrZtTvXt6NB20n4uUrEPNDoYOjL/WS9lHmYOhLLso0JcICST7G9Ib6MQJ5EnZwVzsCmZsWIz8LmE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598613264; 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=lWTOH+z84MeDRfBMtXsIPBW6qvDBURO7EAsFi1//81g=; b=DV93l74bu4aoz2LZVaxj/lPHBZovJysVYTg/XNo7fkCRU2bwnERFzAjLSrG3v/SD9KqWvGXS1wTPrNZn3gy7QRgkixcF0p+hPq3Lvf6f2cH7q7iG/4BMVSihFVGIkIX19AmdgqvUcZtDy7V3JCBD+2zJWmA8uhrCwFiZU355GFw= 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 15986132642861019.5464339263787; Fri, 28 Aug 2020 04:14:24 -0700 (PDT) Received: from localhost ([::1]:33540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcKs-0006K0-Ur for importer@patchew.org; Fri, 28 Aug 2020 07:14:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcGN-0005ak-8T for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:43 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:21350 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcGL-0000dM-9x for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:42 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-253-StxHYHVZPWWN3GCtIn86Gg-1; Fri, 28 Aug 2020 07:09:36 -0400 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 AE70581F02E for ; Fri, 28 Aug 2020 11:09:35 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 849BD19C59; Fri, 28 Aug 2020 11:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612980; 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=lWTOH+z84MeDRfBMtXsIPBW6qvDBURO7EAsFi1//81g=; b=JGoSunY7a2yar27vQm/6K8jKrDSqdbp/u7BysSgRGO0oDWqWD/W1jGd+gunsNwtkR2o7Lh 36AlgvgVc1faKRYqQiPOXtHD4PT90bIS51SpvgfUuRa+Z24saRq2XiIJC9Zqz2SvMEvVRy PPmYugdK2jRLwx6tyftZ30qjFRRbnaA= X-MC-Unique: StxHYHVZPWWN3GCtIn86Gg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 13/16] meson: convert the speed tests Date: Fri, 28 Aug 2020 15:07:31 +0400 Message-Id: <20200828110734.1638685-14-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@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=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 01:02:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Use meson benchmark() for them, adjust mtest2make.py for that. Signed-off-by: Marc-Andr=C3=A9 Lureau --- Makefile | 2 +- scripts/mtest2make.py | 3 ++- tests/Makefile.include | 11 ----------- tests/meson.build | 16 ++++++++++++++++ 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 81794d5c34..a2d068ca37 100644 --- a/Makefile +++ b/Makefile @@ -71,7 +71,7 @@ ${ninja-targets-c_COMPILER} ${ninja-targets-cpp_COMPILER}= : .var.command +=3D -MP # reread (and MESON won't be empty anymore). ifneq ($(MESON),) Makefile.mtest: build.ninja scripts/mtest2make.py - $(MESON) introspect --tests | $(PYTHON) scripts/mtest2make.py > $@ + $(MESON) introspect --tests --benchmarks | $(PYTHON) scripts/mtest2make.p= y > $@ -include Makefile.mtest endif =20 diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index d7a51bf97e..06d017154c 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -50,7 +50,8 @@ endef =20 suites =3D defaultdict(Suite) i =3D 0 -for test in json.load(sys.stdin): +introspect =3D json.load(sys.stdin) +for test in introspect['tests'] + introspect['benchmarks']: env =3D ' '.join(('%s=3D%s' % (shlex.quote(k), shlex.quote(v)) for k, v in test['env'].items())) executable =3D test['cmd'][0] diff --git a/tests/Makefile.include b/tests/Makefile.include index 9fb61ff900..30d4c6f932 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -38,16 +38,8 @@ export SRC_PATH SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ $(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak))) =20 -check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-hash$(EXESUF) -check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-hmac$(EXESUF) -check-speed-$(CONFIG_BLOCK) +=3D tests/benchmark-crypto-cipher$(EXESUF) - QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest =20 -tests/benchmark-crypto-hash$(EXESUF): tests/benchmark-crypto-hash.o $(test= -crypto-obj-y) -tests/benchmark-crypto-hmac$(EXESUF): tests/benchmark-crypto-hmac.o $(test= -crypto-obj-y) -tests/benchmark-crypto-cipher$(EXESUF): tests/benchmark-crypto-cipher.o $(= test-crypto-obj-y) - tests/migration/stress$(EXESUF): tests/migration/stress.o $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"L= INK","$(TARGET_DIR)$@") =20 @@ -97,9 +89,6 @@ define do_test_tap "TAP","$@") endef =20 -check-speed: $(check-speed-y) - $(call do_test_human, $^) - # Per guest TCG tests =20 BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) diff --git a/tests/meson.build b/tests/meson.build index a2902bde45..4d6bcf06b3 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -108,6 +108,8 @@ tests =3D { 'test-qapi-util': {}, } =20 +benchs =3D {} + if have_block tests +=3D { 'test-coroutine': {'deps': [testblock]}, @@ -166,6 +168,11 @@ if have_block if 'CONFIG_NETTLE' in config_host or 'CONFIG_GCRYPT' in config_host tests +=3D {'test-crypto-pbkdf': {'deps': [io]}} endif + benchs +=3D { + 'benchmark-crypto-hash': {'deps': [crypto]}, + 'benchmark-crypto-hmac': {'deps': [crypto]}, + 'benchmark-crypto-cipher': {'deps': [crypto]}, + } endif =20 if have_system @@ -225,6 +232,15 @@ foreach test_name, extra_args: tests suite: suite) endforeach =20 +foreach bench_name, extra_args: benchs + src =3D extra_args.get('src', [bench_name + '.c']) + exe =3D executable(bench_name, src, + dependencies: [qemuutil] + extra_args.get('deps', [])) + benchmark(bench_name, exe, + args: ['--tap', '-k'], + protocol: 'tap', + suite: ['speed']) +endforeach =20 if have_tools and 'CONFIG_VHOST_USER' in config_host executable('vhost-user-bridge', --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598613388; cv=none; d=zohomail.com; s=zohoarc; b=KcpOaYANSjaM4u3x+gcUFS3yI+0Qc+3+56+T1ZsOdPyMhOlncieKZmGa/cSwc1SkDBXZWXMJjlhtZ2CxO0gvmmyOggK0r5j/jfIdpHv5ZgbgrMC1mol1qxP7SvAxBxzhwGhLoMVsKs395ss6WEtZSjxYXR3/gK0TTOEsINisXhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598613388; 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=dgQf2ujlym+Fg5jMiowmuQ3JHx3gFliwhKvldJALH6I=; b=nbo7OaNm2TpZbL940Zd+KNFgo2M1mi1YeyJtnc4wAwB2BrvknbBtlT+8J2cjDEu5zESWI/7RINZjcGW7NyXoZTfDsRCYn1Ss9Z285fCFTchMf/3O4hO0sRBrlWdmt+fSfzOaG3KSuSgjDU9wDJQ0EZ3q8QlxxyNlDjpZOdPwJEk= 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 1598613388139480.14934800302694; Fri, 28 Aug 2020 04:16:28 -0700 (PDT) Received: from localhost ([::1]:41862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcMr-0001Ok-Mi for importer@patchew.org; Fri, 28 Aug 2020 07:16:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcGR-0005lq-BC for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:47 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:58887 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcGO-0000dX-8F for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:47 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-434-8KskILbONWq5mEKv2kdk5w-1; Fri, 28 Aug 2020 07:09:41 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 081761007471 for ; Fri, 28 Aug 2020 11:09:41 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 087057C0EB; Fri, 28 Aug 2020 11:09:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612983; 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=dgQf2ujlym+Fg5jMiowmuQ3JHx3gFliwhKvldJALH6I=; b=UD8G+80D0bC1pThJhpHxEgrMD7e7Lva31uvfSPhbZgm4EJZ+BgABhKx3LPQnHywkXVUqy+ aGc+brQonKmSSQ5Jcy+n7mBkbTT4q6QIctwNyzbqCCnvjOv2bDUVEYPxRjMuPhhV085EEo TlNp6ses8RgQPlayb5D9gue74cCfqQw= X-MC-Unique: 8KskILbONWq5mEKv2kdk5w-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 14/16] tests/migration/stress: remove unused exit_success Date: Fri, 28 Aug 2020 15:07:32 +0400 Message-Id: <20200828110734.1638685-15-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 04:08:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/migration/stress.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tests/migration/stress.c b/tests/migration/stress.c index a062ef6b55..05d85051e3 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -47,19 +47,6 @@ static __attribute__((noreturn)) void exit_failure(void) } } =20 -static __attribute__((noreturn)) void exit_success(void) -{ - if (getpid() =3D=3D 1) { - sync(); - reboot(RB_POWER_OFF); - fprintf(stderr, "%s (%05d): ERROR: cannot reboot: %s\n", - argv0, gettid(), strerror(errno)); - abort(); - } else { - exit(0); - } -} - static int get_command_arg_str(const char *name, char **val) { --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598613213; cv=none; d=zohomail.com; s=zohoarc; b=CnXizu7iXOnxqOLEeVSx736WKpPBoCrCkhY9lFsHMxU5Jh3dzxHrRrdSV2wDKCTuEDYov32t9qMWAZ901nduozxTosLuRYfDFH78oo2JiOUVvRZqBpLKb1kGcJMqJ0KFvzuXJU47aClnksi4rjihDqTbILt8hfRCd9O2qehbaWQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598613213; 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=knDwBoTRIu/6pmdzHFuI+i2z60A8pL5efZSsvt2zSuU=; b=KSwSkjPrO+PZIZuQtWzSO35rnOfyQ2sfy1UAONz6WvUTSCo3i2MyJ0Xr56BuFHY+asbb16jlW+iwc+FQyPPChuQ2X+zn55jJsFj/TEmAhuIVQjwEMRNb4zoVkMgUmZNZa+54CqF030GKFG8WkTpKbIDCEvvPLBv54nKrLYo2Geg= 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 1598613213736785.9449942785528; Fri, 28 Aug 2020 04:13:33 -0700 (PDT) Received: from localhost ([::1]:57454 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcK4-0004ZB-DJ for importer@patchew.org; Fri, 28 Aug 2020 07:13:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39994) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcGZ-00061P-RU for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:22903 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcGX-0000eF-An for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:09:55 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-56--xEDqYb1OL2ESPKjG-BFLA-1; Fri, 28 Aug 2020 07:09:50 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4E020801AAB for ; Fri, 28 Aug 2020 11:09:49 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6752C10027A6; Fri, 28 Aug 2020 11:09:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598612992; 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=knDwBoTRIu/6pmdzHFuI+i2z60A8pL5efZSsvt2zSuU=; b=P3aIz5L3AyqMUsocDbWctrPLtR3UBt5imXYtEsSuLpe2WKXQWdYj60fE6XMIG73nn77mgt /MoGlWcSpk2jzBoFh7WznWkuBuXx4mk2dsVAPDQ5ZTaHgFkGJq4KmBGTSNO5qa3FXcRrIN CcGdOxo+cYfW5eS5HKIQoQ0kDyaictA= X-MC-Unique: -xEDqYb1OL2ESPKjG-BFLA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 15/16] meson: fix migration/stress compilation with glib>=2.30 Date: Fri, 28 Aug 2020 15:07:33 +0400 Message-Id: <20200828110734.1638685-16-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 04:08:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau gettid() was introduced with glibc 2.30. Signed-off-by: Marc-Andr=C3=A9 Lureau --- meson.build | 3 +++ tests/migration/stress.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/meson.build b/meson.build index 421f53083e..a8e074f4fa 100644 --- a/meson.build +++ b/meson.build @@ -408,6 +408,8 @@ if 'CONFIG_TASN1' in config_host endif keyutils =3D dependency('keyutils', required: false) =20 +has_gettid =3D cc.has_function('gettid') + # Create config-host.h =20 config_host_data.set('CONFIG_SDL', sdl.found()) @@ -418,6 +420,7 @@ config_host_data.set('CONFIG_VNC_PNG', png.found()) config_host_data.set('CONFIG_VNC_SASL', sasl.found()) config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found()) config_host_data.set('CONFIG_KEYUTILS', keyutils.found()) +config_host_data.set('CONFIG_GETTID', has_gettid) config_host_data.set('QEMU_VERSION', '"@0@"'.format(meson.project_version(= ))) config_host_data.set('QEMU_VERSION_MAJOR', meson.project_version().split('= .')[0]) config_host_data.set('QEMU_VERSION_MINOR', meson.project_version().split('= .')[1]) diff --git a/tests/migration/stress.c b/tests/migration/stress.c index 05d85051e3..0c72a420be 100644 --- a/tests/migration/stress.c +++ b/tests/migration/stress.c @@ -29,10 +29,12 @@ const char *argv0; =20 #define PAGE_SIZE 4096 =20 +#ifndef CONFIG_GETTID static int gettid(void) { return syscall(SYS_gettid); } +#endif =20 static __attribute__((noreturn)) void exit_failure(void) { --=20 2.26.2 From nobody Sun Nov 16 04:12:33 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598613268; cv=none; d=zohomail.com; s=zohoarc; b=Rc9PO7BofilyGjHcIwQtLazYojY+7vH/TkY6rrWdzDWjVRs3AlFOO9xiwWytLE5TyJLAivVY4Plk4SSgz27w/VXp89sJofhytCnuF5cWMFsDN85EOMSOThSo4uGTWrcU/SdaDTwe/SFoOqm5BTAt3/kUlZnrXHx7TpOQ2wauvak= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598613268; 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=HV35Mezsi0HSTtx5F2YjaL6Mk9/5E72GBfTRj64cdTU=; b=DpSLd2aPE6uQl8VJomXY+ohYyhNly+GwcJcU6njYuVcn36MyBnkN+Tu3vJk1LPs0r0giYTS6ncTsumhil1bKEWtMpDtyEYJzp28V7tj+2bd980g/W1JIMQNAN0GGqodCmoPlRUhn70J+9Vu1gjOrSGdt2ThvG6svYgqe4M2w+rY= 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 1598613268848874.4442715664547; Fri, 28 Aug 2020 04:14:28 -0700 (PDT) Received: from localhost ([::1]:33990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBcKw-0006Uq-Gk for importer@patchew.org; Fri, 28 Aug 2020 07:14:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40038) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBcGj-0006Kr-O6 for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:10:05 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:21899 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBcGh-0000fd-Nn for qemu-devel@nongnu.org; Fri, 28 Aug 2020 07:10:05 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-283-Tfa60AD2PHiMq6M676MREg-1; Fri, 28 Aug 2020 07:09:57 -0400 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 20BAA18A2240 for ; Fri, 28 Aug 2020 11:09:57 +0000 (UTC) Received: from localhost (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1D79E19C59; Fri, 28 Aug 2020 11:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598613002; 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=HV35Mezsi0HSTtx5F2YjaL6Mk9/5E72GBfTRj64cdTU=; b=EKDNaeygwy3mIFaoc8DLs6dAgBLQTdXq+N0zmQl2ESlACdnhQgPJE11O6uCxasvkTElEfx MLyLQFFmUNMLSJxDHJsWnU7lnDQeB9rFukQxLboSsqvLomfARMUEKzGEokz2Q002dDefxn 3wzHa1xXPZCim1Gpvj/pExhx9qwn9qw= X-MC-Unique: Tfa60AD2PHiMq6M676MREg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 16/16] meson: convert migration/initrd-stress Date: Fri, 28 Aug 2020 15:07:34 +0400 Message-Id: <20200828110734.1638685-17-marcandre.lureau@redhat.com> In-Reply-To: <20200828110734.1638685-1-marcandre.lureau@redhat.com> References: <20200828110734.1638685-1-marcandre.lureau@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=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/28 00:28:43 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau --- tests/Makefile.include | 14 -------------- tests/meson.build | 1 + tests/migration/initrd-stress.sh | 10 ++++++++++ tests/migration/meson.build | 14 ++++++++++++++ 4 files changed, 25 insertions(+), 14 deletions(-) create mode 100755 tests/migration/initrd-stress.sh create mode 100644 tests/migration/meson.build diff --git a/tests/Makefile.include b/tests/Makefile.include index 30d4c6f932..0d36bd11d4 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -38,20 +38,6 @@ export SRC_PATH SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ $(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak))) =20 -QEMU_CFLAGS +=3D -I$(SRC_PATH)/tests -I$(SRC_PATH)/tests/qtest - -tests/migration/stress$(EXESUF): tests/migration/stress.o - $(call quiet-command, $(LINKPROG) -static -O3 $(PTHREAD_LIB) -o $@ $< ,"L= INK","$(TARGET_DIR)$@") - -INITRD_WORK_DIR=3Dtests/migration/initrd - -tests/migration/initrd-stress.img: tests/migration/stress$(EXESUF) - mkdir -p $(INITRD_WORK_DIR) - cp $< $(INITRD_WORK_DIR)/init - (cd $(INITRD_WORK_DIR) && (find | cpio --quiet -o -H newc | gzip -9)) > $@ - rm $(INITRD_WORK_DIR)/init - rmdir $(INITRD_WORK_DIR) - SPEED =3D quick =20 # gtester tests, possibly with verbose output diff --git a/tests/meson.build b/tests/meson.build index 4d6bcf06b3..257a474daa 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -268,3 +268,4 @@ endif =20 subdir('qapi-schema') subdir('qtest') +subdir('migration') diff --git a/tests/migration/initrd-stress.sh b/tests/migration/initrd-stre= ss.sh new file mode 100755 index 0000000000..0f20ac29a6 --- /dev/null +++ b/tests/migration/initrd-stress.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +INITRD=3D"$1" +STRESS=3D"$2" + +INITRD_DIR=3D$(mktemp -d -p '' "initrd-stress.XXXXXX") +trap 'rm -rf $INITRD_DIR' EXIT + +cp "$STRESS" "$INITRD_DIR/init" +(cd "$INITRD_DIR" && (find | cpio --quiet -o -H newc | gzip -9)) > "$INITR= D" diff --git a/tests/migration/meson.build b/tests/migration/meson.build new file mode 100644 index 0000000000..f215ee7d3a --- /dev/null +++ b/tests/migration/meson.build @@ -0,0 +1,14 @@ +stress =3D executable( + 'stress', + files('stress.c'), + dependencies: [glib], + link_args: ['-static'], + build_by_default: false, +) + +custom_target( + 'initrd-stress.img', + output: 'initrd-stress.img', + input: stress, + command: [find_program('initrd-stress.sh'), '@OUTPUT@', '@INPUT@'] +) --=20 2.26.2