From nobody Fri May 17 03:01:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1611673963; cv=none; d=zohomail.com; s=zohoarc; b=C7yr5n68CZoSJ6EEJnBmBELPWvO2f3UyLAgq+yQZz328d6CPZGTkBlEvmZZiG8D8Ev0YTTZ2YK2llHsTDkeOQUN7DlKlIWiF0dKb/Ozh8NHqL178/J3qd7iyz8IPBd+h0fxOXaPdAaPLBKqfmA+3Dy9hzyGOugvAJUMvfn2Anbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611673963; 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=UlvfDxj7BQqNhHmBMs0ah4O/KbAuLVUJ+0kQsdSlOMw=; b=gZ2YrC5iF5sXIvTNgj5IrLwfRva5H0S/Ku4f6nD+RZjS+MhqPb+fv50JBKjPBPi/HJpEo8yu8n1t4+mDYKFCaFAqtoGl+mfEzYaWS7sXv4FgYmVnHIBnhfhWlo6NhXkqpXG7JvQdLD486LJE0woCaZv5BdGvdFLhDqAR7w8ZR04= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1611673963603833.6513438087411; Tue, 26 Jan 2021 07:12:43 -0800 (PST) Received: from localhost ([::1]:41734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4Q1K-0005At-3l for importer@patchew.org; Tue, 26 Jan 2021 10:12:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4PjI-0005gt-Qr for qemu-devel@nongnu.org; Tue, 26 Jan 2021 09:54:06 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:36182) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4PjE-00007E-L8 for qemu-devel@nongnu.org; Tue, 26 Jan 2021 09:54:04 -0500 Received: by mail-wr1-x42a.google.com with SMTP id 6so16770686wri.3 for ; Tue, 26 Jan 2021 06:53:59 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m18sm8323731wrx.17.2021.01.26.06.53.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 06:53:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 213A31FF87; Tue, 26 Jan 2021 14:53:57 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UlvfDxj7BQqNhHmBMs0ah4O/KbAuLVUJ+0kQsdSlOMw=; b=hLYy0scEQI3oGwxi3eMH0otHcZRF3Ie+ENrP/YsvAbkhPFxNHpkHxkdPUYf0AhzqXH /k/TnS9ei5NIEmOqbyj3zwBCebaBIbLknn2x2VOrJYzJd34hVai0ImNccQ3TfuAzxWvA iWrTJlamgm7kIBRG9kULTxzPsQ93JcEQX19bGwLyQIOyxjYrwpA8Ge9NJjVoi/qGoPf6 N72CAwtpOD1fQg+oMl91uBKKVjU/fOZ5Bg/Esmoy6MW2J7NU4VYu50B8s2PAVMpI/XVT hwQePKZ6oZI5EHbv6Mhpc/O3dAocesqbgVWpYgaz57FgKsbLtTtlPRsazJ9DcNJ+KzK5 wfYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UlvfDxj7BQqNhHmBMs0ah4O/KbAuLVUJ+0kQsdSlOMw=; b=ouPSgB9er0U84PNIRXqsObUAoFJGveP5BDQ+5TL2WkUGKMx8dR6Gi+GxboXT9+YEcg jN7kEfge8xb//X4hlp+LodGpl/KT8aZZwoGviJduA0g37dmLcK2z5AhWan16nb98QUEA rHYr3C4DIoWsMQNggVt76g1FX5+W+D1AGgSGrGW+xhiMaPpKiOZhWljZeBof5Za9mNrl caGaaWhHpUIEU6Z1IGA2lysrerXAsAuPZRVJP/5xDj0CeY22wsTk0ZkS/jxoC+77oUu3 WvWK6/YGvSjyEZvB0/5ANXsqaGjuQ7aQVD4qVG3URqF75esCbNZwySavNhfuzFcId4IF J6Lg== X-Gm-Message-State: AOAM533gmiNcjEg2wCzDz9FAI5HUJRxMgl+kPn0YG0Fd3csWINclTh4P jKfAuWg1esPajxEAue2d+jKlUw== X-Google-Smtp-Source: ABdhPJxrRSMKV4atjE1uGWwU+eJ/IhQgrVDn/pJSQlCb2dT4XS4Z1HLQzCl1u9HJ2v0wfS0dF5LInQ== X-Received: by 2002:a5d:560c:: with SMTP id l12mr6314367wrv.417.1611672839008; Tue, 26 Jan 2021 06:53:59 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/2] scripts/mtest2make.py: export all-%s-targets variable and use it Date: Tue, 26 Jan 2021 14:53:55 +0000 Message-Id: <20210126145356.7860-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210126145356.7860-1-alex.bennee@linaro.org> References: <20210126145356.7860-1-alex.bennee@linaro.org> MIME-Version: 1.0 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=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: Cleber Rosa , =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org, Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) There are some places where the conditional makefile support is the simplest solution. Now we don't expose CONFIG_TCG as a variable create a new one that can be checked for the check-help output. As check-tcg is a PHONY target we re-use check-softfloat to gate that as well. Signed-off-by: Alex Benn=C3=A9e --- scripts/mtest2make.py | 1 + tests/Makefile.include | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index 25ee6887cf..cbbcba100d 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -110,6 +110,7 @@ def emit_suite(name, suite, prefix): print('ifneq ($(filter %s %s, $(MAKECMDGOALS)),)' % (target, prefix)) print('.tests +=3D $(.test.$(SPEED).%s)' % (target, )) print('endif') + print('all-%s-targets +=3D %s' % (prefix, target)) =20 targets =3D {t['id']: [os.path.relpath(f) for f in t['filename']] for t in introspect['targets']} diff --git a/tests/Makefile.include b/tests/Makefile.include index 3a0524ce74..3ce8b03f34 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -12,7 +12,7 @@ check-help: @echo " $(MAKE) check-speed Run qobject speed tests" @echo " $(MAKE) check-qapi-schema Run QAPI schema tests" @echo " $(MAKE) check-block Run block tests" -ifeq ($(CONFIG_TCG),y) +ifneq ($(filter $(all-check-targets), check-softfloat),) @echo " $(MAKE) check-tcg Run TCG tests" @echo " $(MAKE) check-softfloat Run FPU emulation tests" endif --=20 2.20.1 From nobody Fri May 17 03:01:07 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1611673996; cv=none; d=zohomail.com; s=zohoarc; b=LNPb9r2WqxOIjDV6tecPeFMHB+KhX6qyKJJccrQUwoiWCDZ/a14WRlh8Q60xHwUpO+yHp8wxCPligB46kZZaFLI2EpQ6KRju+PtfEuBlNh7b46zzunwS15EtwAEO7pIDBEIWTwwN29tYbraXcTkNbNffm9qUnxokaThFoxKvqRQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611673996; 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=XnIiV3DzWrSm/DAQmEemcSTp/e/oYXKiquN/7lrri3s=; b=d5XSzq9vDBaWgRRM6SegaW1uOnlxTty7d9/7LGKk705hb2U8LWSypV3K2ULD3oNnLy6x3ydQcrqlV+iUBe+V4hy3En8SDRlBfWIVWkePR4gB1nrb4MS/zH6UI/AtVwy+3IJt6n2V2vdWA1n9XkWFtuwOrt9almE4GsJuP2XBNY8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 16116739964541003.7508229462982; Tue, 26 Jan 2021 07:13:16 -0800 (PST) Received: from localhost ([::1]:43806 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l4Q1r-00063x-AQ for importer@patchew.org; Tue, 26 Jan 2021 10:13:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l4PjO-0005lE-DW for qemu-devel@nongnu.org; Tue, 26 Jan 2021 09:54:12 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:35094) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l4PjI-00008H-Gz for qemu-devel@nongnu.org; Tue, 26 Jan 2021 09:54:08 -0500 Received: by mail-wm1-x333.google.com with SMTP id e15so3058669wme.0 for ; Tue, 26 Jan 2021 06:54:02 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b12sm19990409wrr.35.2021.01.26.06.53.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Jan 2021 06:53:57 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 386581FF8C; Tue, 26 Jan 2021 14:53:57 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XnIiV3DzWrSm/DAQmEemcSTp/e/oYXKiquN/7lrri3s=; b=C9niEHAdM2qOkrwiyXqmffC1hA6EMCHZeznj0BLtMRwBLGVR6fCPy8paar0JRdr5Bu dRctIKsG1mDfSmpqBVktAMLcYnyf3JDRuPPNulPJIXQbwUBkJl9obtgOYWhqrWP14Dwe HdEH4awDWFZ5EBNeeZ+k5xkPt6ARgQBz/gMGB+FXgmJeyHbiupM4Ndxk7aEMNytkvxBL 8iexhXqaSBocBQioVGuXQC21QlPwNWklyLOG4agVPmGUk9weLn2H380Bcx75TO1xdn14 KGlwZW2Tt8Vz/v4AJf4g4OZ1GhDg42ioJXlcMo0lYAOyOOLmbui6tUcIHB/iGJTx8SIR SC2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XnIiV3DzWrSm/DAQmEemcSTp/e/oYXKiquN/7lrri3s=; b=bpUZAZIQ2FejM2OYhnobOifjWGeBNYQnm/UtqhS3k/31snyh7GkjszW1yT6y+xMTbl 8Y68rlnQt62dSs2Kn1GC4ZplTeTE3+z0KCjmfDMoVBPyUg7a/d1ZR/L9cUFmcsygonNi /IZzuwzLuqC67b63NjWxeS1HaYKfdwuIvbxp9Hk5RpaPt/GDsRDJhADDRZ3X+KhDExcf dlbKQT8sNfcA7lt+yU4smQvvoIcgymD1GX5sCfjwbcFNUJvbASTzBhR0a+opGzNR+VnG o6v0bswMM3diV6/iZvK/3Dr7v5koNuagDQCSjW7ztIYWXPrbAQFy3ifF2XOgDLNaBJ1r xgOw== X-Gm-Message-State: AOAM533bMmrLv1snzJ64kuWqCOqLwENsmnRaFwDxrZTzotbdqXz6G0uq QA6cG4Oo67X4qR9uympSgFhKOA== X-Google-Smtp-Source: ABdhPJzHX3ECjOrE8bESjlio/pdO/ZL5o6dx1c7smHRXTCPbT71NYLYpeMQa70IEwIrmTy5uBnn3sA== X-Received: by 2002:a1c:a145:: with SMTP id k66mr140619wme.18.1611672841907; Tue, 26 Jan 2021 06:54:01 -0800 (PST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/2] tests/Makefile.include: don't use TARGET_DIRS for check-tcg Date: Tue, 26 Jan 2021 14:53:56 +0000 Message-Id: <20210126145356.7860-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210126145356.7860-1-alex.bennee@linaro.org> References: <20210126145356.7860-1-alex.bennee@linaro.org> MIME-Version: 1.0 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=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: Paolo Bonzini , =?UTF-8?q?Alex=20Benn=C3=A9e?= , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) TARGET_DIRS reflects what we wanted to configure which in the normal case is all our targets. However once meson has pared-down our target list due to missing features we need to check the final list of ninja-targets. This prevents check-tcg barfing on a --disable-tcg build. Suggested-by: Paolo Bonzini Signed-off-by: Alex Benn=C3=A9e Acked-by: Paolo Bonzini --- Makefile | 3 +++ tests/Makefile.include | 7 +++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a380bbfa12..a25b2a5431 100644 --- a/Makefile +++ b/Makefile @@ -174,6 +174,9 @@ ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),) endif endif =20 +# Build up our target list from the filtered list of ninja targets +TARGETS=3D$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targe= ts))) + # Force configure to re-run if the API symbols are updated ifeq ($(CONFIG_PLUGIN),y) config-host.mak: $(SRC_PATH)/plugins/qemu-plugins.symbols diff --git a/tests/Makefile.include b/tests/Makefile.include index 3ce8b03f34..ee438f8d6d 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -41,10 +41,9 @@ SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ SPEED =3D quick =20 # Per guest TCG tests - -BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) -CLEAN_TCG_TARGET_RULES=3D$(patsubst %,clean-tcg-tests-%, $(TARGET_DIRS)) -RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS)) +BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TARGETS)) +CLEAN_TCG_TARGET_RULES=3D$(patsubst %,clean-tcg-tests-%, $(TARGETS)) +RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(TARGETS)) =20 # Probe for the Docker Builds needed for each build $(foreach PROBE_TARGET,$(TARGET_DIRS), \ --=20 2.20.1