From nobody Tue Feb 10 02:33:26 2026 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=1648477095; cv=none; d=zohomail.com; s=zohoarc; b=NE+60/6jswGxmFsXBEbDlzwZzFCW+yiqiX2QIuFRAZMfppWVmfSvdl3L+S8jdUOVXUcYjjAo98B+l9hymyMj/+WjO8dDnpiH0Ek9x4mXkSM1ulOOVCMhD2ZlBuqeRk+dYCF9INYiHBdZ7/1y9RheuNl5tXZooyfeslRGZUW03WQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648477095; 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=BiuPOcC9L2prnG/HfGbgCg95shOxGTKPxvzZmrIjN+o=; b=m/E+SJdlbhvXyCk7r6k0eOTAU/1CHuO4QxsXqX1vwocHqhqszb/yWXZEylmSQw5jjs1q6zfQVZlBIVTs+N408xaFD7Nc08bu2b+Xw3qKX4GVOkFjYNEsmx1/P4duhVm2QsrFIO66S/cs7Pw+xmD2FZcH7B+aBm2ge7M3ArP/XXI= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648477095672458.2476332949577; Mon, 28 Mar 2022 07:18:15 -0700 (PDT) Received: from localhost ([::1]:58256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYqCC-0005Ch-P0 for importer@patchew.org; Mon, 28 Mar 2022 10:18:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxL-0001iI-SW for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24305) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxF-0004jj-T4 for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:49 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-416-q4Ant7AfMJeaYMW861lvxw-1; Mon, 28 Mar 2022 10:02:42 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6FC2038008A1; Mon, 28 Mar 2022 14:02:42 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 571E11121321; Mon, 28 Mar 2022 14:02:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648476165; 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=BiuPOcC9L2prnG/HfGbgCg95shOxGTKPxvzZmrIjN+o=; b=SG1Ijtgtk63U/Y1gCEjgIao31y4xKaa14MwLr1aogb8ZVGuxaAzviiIeW85nt0l719gOhq aelvsesFX5xWZVMY8jGb5vTdUahcIcgeV2AGtdP49QxZhNel6uIIIGo8cIl7GAiVTlTYQU Aa7NxbnsyhRQDq/T8hi8DNbKiPvdms0= X-MC-Unique: q4Ant7AfMJeaYMW861lvxw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 12/15] tests/tcg: list test targets in Makefile.prereqs Date: Mon, 28 Mar 2022 10:02:37 -0400 Message-Id: <20220328140240.40798-13-pbonzini@redhat.com> In-Reply-To: <20220328140240.40798-1-pbonzini@redhat.com> References: <20220328140240.40798-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1648477097198100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Omit the rules altogether for targets that do not have a compiler. Makefile.qemu now is only invoked if the tests are actually built/run. Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 14 +++++++------- tests/tcg/Makefile.qemu | 11 ----------- tests/tcg/configure.sh | 14 ++++++++++---- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index b5d0d6bc98..091ca8513f 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -36,19 +36,16 @@ export SRC_PATH =20 SPEED =3D quick =20 -# Build up our target list from the filtered list of ninja targets -TARGETS=3D$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targe= ts))) - -include tests/tcg/Makefile.prereqs config-host.mak: $(SRC_PATH)/tests/tcg/configure.sh tests/tcg/Makefile.prereqs: config-host.mak =20 # Per guest TCG tests -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)) +BUILD_TCG_TARGET_RULES=3D$(patsubst %,build-tcg-tests-%, $(TCG_TESTS_TARGE= TS)) +CLEAN_TCG_TARGET_RULES=3D$(patsubst %,clean-tcg-tests-%, $(TCG_TESTS_TARGE= TS)) +RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(TCG_TESTS_TARGETS)) =20 -$(foreach TARGET,$(TARGETS), \ +$(foreach TARGET,$(TCG_TESTS_TARGETS), \ $(eval $(BUILD_DIR)/tests/tcg/config-$(TARGET).mak: config-host.ma= k)) =20 $(BUILD_TCG_TARGET_RULES): build-tcg-tests-%: $(if $(CONFIG_PLUGIN),test-p= lugins) @@ -84,6 +81,9 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES) =20 .PHONY: check-venv check-avocado check-acceptance check-acceptance-depreca= ted-warning =20 +# Build up our target list from the filtered list of ninja targets +TARGETS=3D$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targe= ts))) + TESTS_VENV_DIR=3D$(BUILD_DIR)/tests/venv TESTS_VENV_REQ=3D$(SRC_PATH)/tests/requirements.txt TESTS_RESULTS_DIR=3D$(BUILD_DIR)/tests/results diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu index 84c8543878..cda5e5a33e 100644 --- a/tests/tcg/Makefile.qemu +++ b/tests/tcg/Makefile.qemu @@ -95,7 +95,6 @@ all: =20 .PHONY: guest-tests =20 -ifneq ($(GUEST_BUILD),) guest-tests: $(GUEST_BUILD) =20 run-guest-tests: guest-tests @@ -105,16 +104,6 @@ run-guest-tests: guest-tests SRC_PATH=3D"$(SRC_PATH)" SPEED=3D$(SPEED) run), \ "RUN", "tests for $(TARGET_NAME)") =20 -else -guest-tests: - $(call quiet-command, true, "BUILD", \ - "$(TARGET) guest-tests SKIPPED") - -run-guest-tests: - $(call quiet-command, true, "RUN", \ - "tests for $(TARGET) SKIPPED") -endif - # It doesn't matter if these don't exits .PHONY: clean-guest-tests clean-guest-tests: diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 991b905354..05e1ac507b 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -82,6 +82,8 @@ fi =20 makefile=3Dtests/tcg/Makefile.prereqs : > $makefile + +tcg_tests_targets=3D for target in $target_list; do arch=3D${target%%-*} =20 @@ -228,6 +230,7 @@ for target in $target_list; do echo "target=3D$target" >> $config_target_mak case $target in *-softmmu) + test -f $source_path/tests/tcg/$arch/Makefile.softmmu-target || cont= inue qemu=3D"qemu-system-$arch" ;; *) @@ -235,11 +238,7 @@ for target in $target_list; do ;; esac =20 - echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile - eval "target_compiler_cflags=3D\${cross_cc_cflags_$arch}" - echo "QEMU=3D$PWD/$qemu" >> $config_target_mak - echo "CROSS_CC_GUEST_CFLAGS=3D$target_compiler_cflags" >> $config_target= _mak =20 got_cross_cc=3Dno =20 @@ -365,5 +364,12 @@ for target in $target_list; do echo "CROSS_CC_HAS_I386_NOPIE=3Dy" >> $config_target_mak ;; esac + else + continue fi + echo "QEMU=3D$PWD/$qemu" >> $config_target_mak + echo "CROSS_CC_GUEST_CFLAGS=3D$target_compiler_cflags" >> $config_target= _mak + echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile + tcg_tests_targets=3D"$tcg_tests_targets $target" done +echo "TCG_TESTS_TARGETS=3D$tcg_tests_targets" >> $makefile --=20 2.31.1