From nobody Mon Feb 9 10:40:03 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=1648476364; cv=none; d=zohomail.com; s=zohoarc; b=MkUyY9bYr5kYkgNW2hImmXKuFdv2fheaSdYsDc/v5p20ldbnZTPzp322wRt1fP4GAVMEqlOPk/Zl80DRymtftwWMwu70PIrF25Pvj57js4JPDKG3h/MSuFzp/vGJABI++QGvguNn701k1tCf5Lp+zn105OxsSQFS2/ABNfGnaXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648476364; 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=8bPnvrORSI4rAUHPYKHYzTbIhSyn577ldJAgpwdsK+Y=; b=GeyMo0kUhG/+ahhL6y/E/48SFnluvbH3SxvzsXROe7ETvwvGV2Dc00AS543jEjTP7SU8YJpXnMyVans4sIN8Y/q5i456rT3ISp1swdC779GN6U8RwS/mawrtfT2dDJsI4cluVMdF9A7VVnKcT0HRqUuhnI9H2iMbIf0GgR1BI0g= 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 164847636465649.96260565445334; Mon, 28 Mar 2022 07:06:04 -0700 (PDT) Received: from localhost ([::1]:33368 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYq0Q-0004V0-HY for importer@patchew.org; Mon, 28 Mar 2022 10:06:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxI-0001hY-5o for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:32772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxE-0004iF-RH for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:47 -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-620-b_upWJ0oM0e7eyyxJetH2w-1; Mon, 28 Mar 2022 10:02:41 -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 E2DE438008B7; Mon, 28 Mar 2022 14:02:40 +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 CB9371121318; Mon, 28 Mar 2022 14:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648476162; 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=8bPnvrORSI4rAUHPYKHYzTbIhSyn577ldJAgpwdsK+Y=; b=EqMADer0bYu1+YF2pXyQ/2kqr5eHxwnTHRx72zyqgfhsUZLuu6CllspWTXAlvtPVcex8Ab nbIJlmeUoCW3o4YsB3HHstWnQl391FaNkixUPqya4RXL5BBPsXFPhqhlfxAxHXZ6qKLg0a 5bU/5X3hMbk3L/jZsGNbVeHBQ0PCJj0= X-MC-Unique: b_upWJ0oM0e7eyyxJetH2w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 01/15] tests/docker: remove dead code Date: Mon, 28 Mar 2022 10:02:26 -0400 Message-Id: <20220328140240.40798-2-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: 1648476366347100001 Content-Type: text/plain; charset="utf-8"; x-default="true" debian-powerpc-user-cross was the only linux-user powered cross builder and it was removed in commit 80394ccf21 ("tests/docker: remove debian-powerpc-user-cross", 2019-09-26). Remove all the infrastructure around it since it is now unused. Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e495b163a0..a6a5a20949 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -229,12 +229,6 @@ DOCKER_PARTIAL_IMAGES +=3D debian-tricore-cross DOCKER_PARTIAL_IMAGES +=3D debian-xtensa-cross DOCKER_PARTIAL_IMAGES +=3D fedora-cris-cross =20 -# Rules for building linux-user powered images -# -# These are slower than using native cross compiler setups but can -# work around issues with poorly working multi-arch systems and broken -# packages. - # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES) $(DOCKER_VIRTUAL_IMAGES)= ,$(DOCKER_IMAGES)), \ $(foreach t,$(DOCKER_TESTS), \ @@ -266,11 +260,6 @@ docker: @echo @echo 'Available container images:' @echo ' $(DOCKER_IMAGES)' -ifneq ($(DOCKER_USER_IMAGES),) - @echo - @echo 'Available linux-user images (docker-binfmt-image-debian-%):' - @echo ' $(DOCKER_USER_IMAGES)' -endif @echo @echo 'Available tests:' @echo ' $(DOCKER_TESTS)' --=20 2.31.1 From nobody Mon Feb 9 10:40:03 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=1648476367; cv=none; d=zohomail.com; s=zohoarc; b=M+qYh0gKUwsNmOgdHcW/HKg/rW8UxbtBDheYH1AfkkOZU0bwRxtIznB4D9JZuPzLeMe/bMIavqHZiWqIOBxjIhDvWIm/ZwiHjURgHQu/MMOzVHk+TqAvBupno+PAR9ooGhlJmNChxzbVloatra7bEaJp4Z3ygJxieUUvt0PlGbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648476367; 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=5IlLGbXL0JN0dlnpPeff/NDLd3w5NrUh4cwcMWblk+M=; b=iOAX77v2+Z/Jv1Rjth354sgSE7+WFdiWQhXjN8x01U6nf1qAw47gTMXg01aPKnZlUhL2O+t85dgYtrGTHQj06oVr2ZugaadfC1OT31Z+vHL0tg8vB3//MRV+yOWy0EDyj3pL2N0VwHdv8QAAIICpWHCfccWEXp1i1jDWKfj18Lk= 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 1648476367895460.4008331725461; Mon, 28 Mar 2022 07:06:07 -0700 (PDT) Received: from localhost ([::1]:33420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYq0U-0004XQ-HI for importer@patchew.org; Mon, 28 Mar 2022 10:06:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxI-0001hZ-Cu for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51088) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxF-0004jW-Jv for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:48 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-620-r3Gc6qS8NIe0RXSniCeGlg-1; Mon, 28 Mar 2022 10:02:41 -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 0DAB1803D7C; Mon, 28 Mar 2022 14:02:41 +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 EA7F91121318; Mon, 28 Mar 2022 14:02:40 +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=5IlLGbXL0JN0dlnpPeff/NDLd3w5NrUh4cwcMWblk+M=; b=jPE0E6feaMqEXWXwKXDpdC37iOBlhumrHLbQoGoOi4yTDzDc3G3DJXpgESfo++gG4E86ov nHiqH6B3v6UKzFHWCEj+Y3jduCMXwyBEsrebrPxQUKxa9bRX11r4dzysZps4Kyamiilj/O HxEW1eOckWM6i8PsY4W7WS1VWHN+Voo= X-MC-Unique: r3Gc6qS8NIe0RXSniCeGlg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 02/15] tests/docker: remove test targets Date: Mon, 28 Mar 2022 10:02:27 -0400 Message-Id: <20220328140240.40798-3-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: 1648476369912100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index a6a5a20949..8248cfdb4f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -99,24 +99,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian= -bootstrap.docker { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) =20 -# These are test targets -USER_TCG_TARGETS=3D$(patsubst %-linux-user,qemu-%,$(filter %-linux-user,$(= TARGET_DIRS))) -EXEC_COPY_TESTS=3D$(patsubst %,docker-exec-copy-test-%, $(USER_TCG_TARGETS= )) - -$(EXEC_COPY_TESTS): docker-exec-copy-test-%: $(DOCKER_FILES_DIR)/empty.doc= ker - $(call quiet-command, \ - $(DOCKER_SCRIPT) build -t qemu/exec-copy-test-$* -f $< \ - $(if $V,,--quiet) --no-cache \ - --include-executable=3D$* \ - --skip-binfmt, \ - "TEST","copy $* to container") - $(call quiet-command, \ - $(DOCKER_SCRIPT) run qemu/exec-copy-test-$* \ - /$* -version > tests/docker-exec-copy-test-$*.out, \ - "TEST","check $* works in container") - -docker-exec-copy-test: $(EXEC_COPY_TESTS) - endif =20 # Enforce dependencies for composite images --=20 2.31.1 From nobody Mon Feb 9 10:40:03 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=1648476568; cv=none; d=zohomail.com; s=zohoarc; b=FeEZBai9vtvoTv79GaAUFDCgxVEfk45zD/uHMifJBDCrceqQyTJpZlb59Vn5uG9qKRcidzeKV6hjGGub13sLw/GJAjbxJEzQFJPVK+kqj60vEG8konI+SJDbWT1gPro5Ze7f4yT6M8Rh13kmAvlK57Dd5JxCV5ta4y+sLQAI/hc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648476568; 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=EjHJkYDoo7EgRNdfVm93d2frhtj2BRugsose6t3Oya8=; b=NHV1ir5NjkWgH3DtBD1kaimpxnoA8D5BhgQXzLe7+I0X1kxGumC8rizlBGt9wf7NWvnQf299eSeDSBI8Ng29cyDlU+vfiuAwJUPmFcYlSk27OvoHeVlr0qhVseosNoWhUA6U6B7G019DSxq+kYJXVcvIHijGilG4r5hdVYPyHA0= 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 1648476568721287.7256363316319; Mon, 28 Mar 2022 07:09:28 -0700 (PDT) Received: from localhost ([::1]:41930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYq3j-0002Ce-9c for importer@patchew.org; Mon, 28 Mar 2022 10:09:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxJ-0001hM-QE for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57077) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxE-0004iV-S0 for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:46 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-610-yen4KqycODuwUrWGHok9zA-1; Mon, 28 Mar 2022 10:02:41 -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 2C075100BAA7; Mon, 28 Mar 2022 14:02:41 +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 156351121318; Mon, 28 Mar 2022 14:02:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648476162; 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=EjHJkYDoo7EgRNdfVm93d2frhtj2BRugsose6t3Oya8=; b=Avh5Wv5fOXzSkIX9ojrxR8zf59TquuQs3LNNQDNIpUnBMfnVNrGG3xGRzQKYQTXK3UbS8m ARakWUUFWgD90loMTwlUxXbQeYLrmTJSSkGf01q0EmCVJS5t+nhQ/fp/jnkHmWfBPYJdOZ GvNqZtCmuWhW+e64QQxoE7kvl8lgtLc= X-MC-Unique: yen4KqycODuwUrWGHok9zA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 03/15] tests/docker: remove dead variable Date: Mon, 28 Mar 2022 10:02:28 -0400 Message-Id: <20220328140240.40798-4-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: 1648476570809100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8248cfdb4f..372517f113 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -13,7 +13,6 @@ HOST_ARCH =3D $(if $(ARCH),$(ARCH),$(shell uname -m)) TESTS ?=3D % IMAGES ?=3D % =20 -DOCKER_SUFFIX :=3D .docker DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 --=20 2.31.1 From nobody Mon Feb 9 10:40:03 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=1648476562; cv=none; d=zohomail.com; s=zohoarc; b=LG2+ic2X/7yWvZ3aWukOcTnYr/TjAdMNj2A1ezQKmYUqRM31ssSrSgwFBciLtiHw3ja6Q5Z9NEjBhvLNElRKrg/7AsJKp09koWhU3l7GDqsAox27ST2mvFXcQIzsOCoELx7YCWHj8v6xX5OK2LYdQpGjvrwecrRmIdel7LI2F2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648476562; 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=LatUtQ0yJhzQWOEx6mKVHXrSRqMEYfl57egTIwLfP4w=; b=Q5G5pyTWlCTdStSZL5AmS0PnIIxKeERic0vFHn96GWEDN0g/ljLYVUUQYvIuvWXd/y8zXeMY+Bj75xpXTzj/NJhXkiKNGyIdUuiJt0OPxlQg1iaPbhRGalW1D1qcRa5dOe9SYhLg2M27Z95f/FgOKYdhAJd0jlYRpzhCh/1XQ+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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1648476562816135.61483215334033; Mon, 28 Mar 2022 07:09:22 -0700 (PDT) Received: from localhost ([::1]:41754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYq3d-000246-97 for importer@patchew.org; Mon, 28 Mar 2022 10:09:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxJ-0001i0-IH for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:59059) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxF-0004jb-RV for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:49 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-99-mjAGwZyWNdan-8znMCL1Xg-1; Mon, 28 Mar 2022 10:02:41 -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 4CBDC83396A; Mon, 28 Mar 2022 14:02:41 +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 33EA31121318; Mon, 28 Mar 2022 14:02:41 +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=LatUtQ0yJhzQWOEx6mKVHXrSRqMEYfl57egTIwLfP4w=; b=jNTLuprmBB9sUeMf+cQdJVadl4S+AFPY0aCSJf+prENV3e6/R21w7m1L01nnpvhSlhs1Mp eKmuc+ZpY6E+JFxCHeIdJuQXRr3Dgwmxu/LVvcM4dvYEq8I7bsR4URLrWPsNGLHRu8Ncej 48ahAu6jH8BUVYLqYXrCnZem38n1it8= X-MC-Unique: mjAGwZyWNdan-8znMCL1Xg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 04/15] tests/docker: remove unnecessary default definitions Date: Mon, 28 Mar 2022 10:02:29 -0400 Message-Id: <20220328140240.40798-5-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.129.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_H4=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: 1648476564640100003 Content-Type: text/plain; charset="utf-8"; x-default="true" The definition of DOCKER_IMAGES and DOCKER_TESTS copes already with an empty value of $(IMAGES) and $(TESTS), no need to force them to "%" if undefined. Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 372517f113..80bb188620 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -8,11 +8,6 @@ COMMA :=3D , =20 HOST_ARCH =3D $(if $(ARCH),$(ARCH),$(shell uname -m)) =20 -# These variables can be set by the user to limit the set of docker -# images and tests to a more restricted subset -TESTS ?=3D % -IMAGES ?=3D % - DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 --=20 2.31.1 From nobody Mon Feb 9 10:40:03 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=1648476369; cv=none; d=zohomail.com; s=zohoarc; b=iZYPv31a/uVLOKPjw/JgIZfKwWI9+1l4MlT9B1yBTHz6vp383bUqKUXMs3/B1Nhd51v7nD1+u/QJxc+HCi2h7qDtQMB+i3eCsv0cHORv+r1RIUoFioMXBdRbZBnqkwka9SlXu+FIMozNRQUQvma3jPZCIlC8xxGue12zXAZf3Vc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648476369; 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=eIGEz1XtW7jJvlKsjKshiDWt+ra+BYFIt4ndLyYfF+g=; b=ae8C9Wl2ibvSrcUP/K2gBO0wcPH74XjL+H3FearBU/ql06CA52+38uJiA73aFTkdQruO3uvZpXxo460cnn7vIUHPjw14SV3IHwZNQgIp2sC3CDfytX5fTYxiEXlSBY4rX7kniS3eR0jGa7AeGSJYLJ2I466+jnvZlwrztt/ly9c= 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 1648476369147370.3147647086115; Mon, 28 Mar 2022 07:06:09 -0700 (PDT) Received: from localhost ([::1]:33398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYq0V-0004Wa-Bk for importer@patchew.org; Mon, 28 Mar 2022 10:06:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxI-0001ho-Lj for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxF-0004jc-OK for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:48 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-292-hCazmr3IM0KKQ7lAmbhdIg-1; Mon, 28 Mar 2022 10:02:41 -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 6C6B7899ED0; Mon, 28 Mar 2022 14:02:41 +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 548FA1121318; Mon, 28 Mar 2022 14:02:41 +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=eIGEz1XtW7jJvlKsjKshiDWt+ra+BYFIt4ndLyYfF+g=; b=OSXVX/eXa0KACfmh35FXvFnvS4Hl+aW/aSUAU1NzPvR88Q7xfq6q+6F7f38eUE8CbUnNI2 h2jRD3ShvGhYxQWDd26m1ElEBnhoCCgz75vctTuLTsULfoJ74hZlhBBZ5uF4KQvrWB6tDA WcrsRop/S4BChawiEJJbUgOkaEs1A5c= X-MC-Unique: hCazmr3IM0KKQ7lAmbhdIg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 05/15] tests/docker: inline variable definitions or move close to use Date: Mon, 28 Mar 2022 10:02:30 -0400 Message-Id: <20220328140240.40798-6-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: 1648476369932100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Variables that are defined with ":=3D" are handled imperatively, so moving them closer to the first use ensures that all the assignments prior to the first use are taken into account. Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 80bb188620..f4bbba47a5 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -9,26 +9,12 @@ COMMA :=3D , HOST_ARCH =3D $(if $(ARCH),$(ARCH),$(shell uname -m)) =20 DOCKER_FILES_DIR :=3D $(SRC_PATH)/tests/docker/dockerfiles -# we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 -# we don't directly build virtual images (they are used to build other ima= ges) -DOCKER_VIRTUAL_IMAGES :=3D debian-bootstrap debian-toolchain empty -__IMAGES :=3D $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(notdir $(bas= ename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) -DOCKER_IMAGES :=3D $(if $(IMAGES), $(filter $(IMAGES), $(__IMAGES)), $(__I= MAGES)) -DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) -# Use a global constant ccache directory to speed up repetitive builds -DOCKER_CCACHE_DIR :=3D $$HOME/.cache/qemu-docker-ccache ifeq ($(HOST_ARCH),x86_64) DOCKER_DEFAULT_REGISTRY :=3D registry.gitlab.com/qemu-project/qemu endif DOCKER_REGISTRY :=3D $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTR= Y)) =20 -__TESTS :=3D $(notdir $(shell \ - find $(SRC_PATH)/tests/docker/ -name 'test-*' -type f)) -DOCKER_TESTS :=3D $(if $(TESTS), $(filter $(TESTS), $(__TESTS)), $(__TESTS= )) - ENGINE :=3D auto - DOCKER_SCRIPT=3D$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE) =20 CUR_TIME :=3D $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) @@ -47,8 +33,6 @@ $(DOCKER_SRC_COPY): =20 docker-qemu-src: $(DOCKER_SRC_COPY) =20 -docker-image: ${DOCKER_TARGETS} - # General rule for building docker images. If we are a sub-make # invoked with SKIP_DOCKER_BUILD we still check the image is up to date # though @@ -96,6 +80,8 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-= bootstrap.docker endif =20 # Enforce dependencies for composite images +# we don't run tests on intermediate images (used as base by another image) +DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 ifeq ($(HOST_ARCH),x86_64) docker-image-debian-amd64: docker-image-debian10 DOCKER_PARTIAL_IMAGES +=3D debian-amd64-cross @@ -205,6 +191,15 @@ DOCKER_PARTIAL_IMAGES +=3D debian-tricore-cross DOCKER_PARTIAL_IMAGES +=3D debian-xtensa-cross DOCKER_PARTIAL_IMAGES +=3D fedora-cris-cross =20 +# images that are only used to build other images +DOCKER_VIRTUAL_IMAGES :=3D debian-bootstrap debian-toolchain empty + +__IMAGES :=3D $(sort $(filter-out $(DOCKER_VIRTUAL_IMAGES), $(notdir $(bas= ename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) +DOCKER_IMAGES :=3D $(if $(IMAGES), $(filter $(IMAGES), $(__IMAGES)), $(__I= MAGES)) + +__TESTS :=3D $(notdir $(shell find $(SRC_PATH)/tests/docker/ -name 'test-*= ' -type f)) +DOCKER_TESTS :=3D $(if $(TESTS), $(filter $(TESTS), $(__TESTS)), $(__TESTS= )) + # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES) $(DOCKER_VIRTUAL_IMAGES)= ,$(DOCKER_IMAGES)), \ $(foreach t,$(DOCKER_TESTS), \ @@ -263,6 +258,9 @@ docker: =20 docker-help: docker =20 +# Use a global constant ccache directory to speed up repetitive builds +DOCKER_CCACHE_DIR :=3D $$HOME/.cache/qemu-docker-ccache + # This rule if for directly running against an arbitrary docker target. # It is called by the expanded docker targets (e.g. make # docker-test-foo@bar) which will do additional verification. @@ -308,5 +306,7 @@ docker-run-%: IMAGE =3D $(shell echo '$@' | sed -e 's/d= ocker-run-\([^@]*\)@\(.*\)/ docker-run-%: @$(MAKE) docker-run TEST=3D$(CMD) IMAGE=3Dqemu/$(IMAGE) =20 +docker-image: ${DOCKER_IMAGES:%=3Ddocker-image-%} + docker-clean: $(call quiet-command, $(DOCKER_SCRIPT) clean) --=20 2.31.1 From nobody Mon Feb 9 10:40:03 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=1648476560; cv=none; d=zohomail.com; s=zohoarc; b=Ezgx3mxeJ9QKOZFb46sdLWGledtq6EYwv9TNTHZpaRZlQVEtS7XiPAF66AnDShq3jaTebIFKT3IGle09EBU40f/NA/CaJTP3tsMUPWL8GpDMy0WDnscmDLrxXtsmaN3co6jEUZsgJxaqb0u5T+GH7qoa11q8fQMNApp1Kmc7pL4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648476560; 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=wOv5m/i45Z5p/dutn3wBGO372HVHJNIJUn4OO1Le8/s=; b=Be7as6TiOYIs+WE0pH3C4YJc6JHrHV9tKXHGjQ45jg2Re5H+kXAiUaY0dAsKgvtPeeLMH/9dgsgSXUfqM8HSjWgVqrR3Vuba6DZrad5JxDBf4XzMIZKhygFySqx9v0YW9t8TYdarr5IwGJgWboWqDlomoDwUH7CBVch8XDxodUQ= 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 1648476560812233.95155461726836; Mon, 28 Mar 2022 07:09:20 -0700 (PDT) Received: from localhost ([::1]:41694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYq3b-00021T-Cx for importer@patchew.org; Mon, 28 Mar 2022 10:09:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40610) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxJ-0001i5-LF for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22086) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxF-0004jh-Rn 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-668-azLagKusMEaPrGqbkX14yA-1; Mon, 28 Mar 2022 10:02:41 -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 8D453280550F; Mon, 28 Mar 2022 14:02:41 +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 7423C1121318; Mon, 28 Mar 2022 14:02:41 +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=wOv5m/i45Z5p/dutn3wBGO372HVHJNIJUn4OO1Le8/s=; b=Fskdu8auNAUDRZZLEdAHrwU/8cW+tOy1LFUPw2H1qeBRAe4QwR0CZ9RIjLjhz2JryM81kK 0TrcTSbfwl2xxdPbfJAe8pnrh+Q9S3PaXaekCCMTUwO2nZY8k9MOZ4Vv3EURUFDkDk/C2U ReReZDqTvi2hgpdEW+Fo8w9hzsoT70k= X-MC-Unique: azLagKusMEaPrGqbkX14yA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 06/15] tests/docker: remove unnecessary filtering of $(DOCKER_IMAGES) Date: Mon, 28 Mar 2022 10:02:31 -0400 Message-Id: <20220328140240.40798-7-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: 1648476562688100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Now that DOCKER_IMAGES is only defined after DOCKER_VIRTUAL_IMAGES is complete, there is no need to re-filter DOCKER_IMAGES against it. Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index f4bbba47a5..5cadd1b53e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -201,7 +201,7 @@ __TESTS :=3D $(notdir $(shell find $(SRC_PATH)/tests/do= cker/ -name 'test-*' -type DOCKER_TESTS :=3D $(if $(TESTS), $(filter $(TESTS), $(__TESTS)), $(__TESTS= )) =20 # Expand all the pre-requistes for each docker image and test combination -$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES) $(DOCKER_VIRTUAL_IMAGES)= ,$(DOCKER_IMAGES)), \ +$(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \ $(foreach t,$(DOCKER_TESTS), \ $(eval .PHONY: docker-$t@$i) \ $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ --=20 2.31.1 From nobody Mon Feb 9 10:40:03 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=1648477093; cv=none; d=zohomail.com; s=zohoarc; b=RnWQ21VjrndgpwXmi34e0K02LEn8uKfNhvdDxIguvMNrN8VT32TS3ONugKIlkMwVqjgGFRMdCLP6l4oQTL+S1J5aDrVzln1Ix6ax04BhFI5iXstBfHlV1Lc+LPq54q/R0aFzWpgIl1GFg7mxbFx6Bv8McEE5rqhVxsHJzfA3vd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648477093; 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=T7pXCjF61d4XC92jWNBorLNqSfo7NsGlj19zgA73IhE=; b=V23+HDAgkS5Z0jmcgo7LkQC76YCrjZwzYSJoNMYGKVu8fPq2XYshJdwpu8lWhsBj5c1cV6YK5gqQ02vEqXzsAcLQzcISRHMglqa2jneSKVAuAkR6jSGaGsy3O30lSafmen2HkA1UEPJBbmjv5Ra0n4gMKecnbTTSqFePxVucvJ0= 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 1648477093972235.52001849579278; Mon, 28 Mar 2022 07:18:13 -0700 (PDT) Received: from localhost ([::1]:58262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYqCC-0005Cx-Hc for importer@patchew.org; Mon, 28 Mar 2022 10:18:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxN-0001rk-Qr for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:38745) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxM-0004la-7R for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:53 -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-630-FKN0bHJTNDesy7twJbVo7g-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 AC73F38008BE; Mon, 28 Mar 2022 14:02:41 +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 94EF71121320; Mon, 28 Mar 2022 14:02:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648476171; 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=T7pXCjF61d4XC92jWNBorLNqSfo7NsGlj19zgA73IhE=; b=BqAKTDnqAMRBI4M6ekeWndt9sCQ77aHF+5sHI8PpAnYdc5PXRynn3NGH1tmP6yZrgnv7HF bV/9ogVno+TEwDEZPuGaZy2CWvfSXrZ3fD0vAFqmhOGqdAUI5dZjWwJ6EiWDyvkCBEXa7l eSq15XcY8EDFzIfRj5HeMcxazqH3/aY= X-MC-Unique: FKN0bHJTNDesy7twJbVo7g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 07/15] tests/docker: simplify docker-TEST@IMAGE targets Date: Mon, 28 Mar 2022 10:02:32 -0400 Message-Id: <20220328140240.40798-8-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: 1648477095228100001 Content-Type: text/plain; charset="utf-8"; x-default="true" No need to go through the shell when we already have the test and images at the point where the targets are declared. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/Makefile.include | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 5cadd1b53e..e1bea20451 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -204,7 +204,9 @@ DOCKER_TESTS :=3D $(if $(TESTS), $(filter $(TESTS), $(_= _TESTS)), $(__TESTS)) $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES)), \ $(foreach t,$(DOCKER_TESTS), \ $(eval .PHONY: docker-$t@$i) \ - $(eval docker-$t@$i: docker-image-$i docker-run-$t@$i) \ + $(eval docker-$t@$i: TEST=3D$t) \ + $(eval docker-$t@$i: IMAGE=3Dqemu/$i) \ + $(eval docker-$t@$i: docker-image-$i; @$(MAKE) docker-run) \ ) \ $(foreach t,$(DOCKER_TESTS), \ $(eval docker-all-tests: docker-$t@$i) \ @@ -298,14 +300,6 @@ docker-run: docker-qemu-src $(call quiet-command, rm -r $(DOCKER_SRC_COPY), \ " CLEANUP $(DOCKER_SRC_COPY)") =20 -# Run targets: -# -# Of the form docker-TEST-FOO@IMAGE-BAR which will then be expanded into a= call to "make docker-run" -docker-run-%: CMD =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)@\= (.*\)/\1/') -docker-run-%: IMAGE =3D $(shell echo '$@' | sed -e 's/docker-run-\([^@]*\)= @\(.*\)/\2/') -docker-run-%: - @$(MAKE) docker-run TEST=3D$(CMD) IMAGE=3Dqemu/$(IMAGE) - docker-image: ${DOCKER_IMAGES:%=3Ddocker-image-%} =20 docker-clean: --=20 2.31.1 From nobody Mon Feb 9 10:40:03 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=1648476566; cv=none; d=zohomail.com; s=zohoarc; b=PimAGcDTfS2yWnubh/1qvGgU4lsZFlClMrZgMZE8D+PkBE3tQ+c5cEiic70lx0sW6n55TaM5c2CDCX9OyOJe5ytjlU0pJ8GZ3npL5D/VH7FtXPNhg4Yf5loFk/adRW1f+oiJvWO+5yX2sMcBBwIjxr5CUNJAkcaWnRS0ETZ8oxw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648476566; 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=WbK8QjUPrfgHm0QyhWEuE6z/4sOVhMhCHwZYmGGLiAM=; b=ctpVJlbAA1jDNbmhDQC6d68QJSxYLv+BhbEp/i65GYgAz9hH7CgPAUkJu7CwoJ8q2SfYx0BNrzXRD5C0NxWZdqfqFXQR37ioTbq0nUFr/nSNPjF/KO83cU9nwOuyRGMYDTFFI66eCdBHLnCHHaHwqevXXZQ2UZ8jjlTYVBrycwY= 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 1648476566527539.6000899197198; Mon, 28 Mar 2022 07:09:26 -0700 (PDT) Received: from localhost ([::1]:41784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYq3d-00026L-D6 for importer@patchew.org; Mon, 28 Mar 2022 10:09:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxH-0001hN-RS for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:60424) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxE-0004jJ-S3 for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:46 -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-674-n7UcMP5VNeq53QqjAg3IzQ-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 CBB8A3C01C1E; Mon, 28 Mar 2022 14:02:41 +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 B4A2A1121320; Mon, 28 Mar 2022 14:02:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1648476163; 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=WbK8QjUPrfgHm0QyhWEuE6z/4sOVhMhCHwZYmGGLiAM=; b=fJv9McQwbpmFLBixQJrmHYgSvuPeH0juXxjommmhgG63zxbhzSb/miBVmcEQ9dU54bOH60 2mopT+saYG1ZbnX7KqXXPcEUScwxb24YEJvRHqonsnkNbriiI4/iz2E6EI1RCm2xHLOPqL pBoCrGpPFI7OoO/ELKbpWANESGi8/9k= X-MC-Unique: n7UcMP5VNeq53QqjAg3IzQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 08/15] tests/tcg: add compiler test variables when using containers Date: Mon, 28 Mar 2022 10:02:33 -0400 Message-Id: <20220328140240.40798-9-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: 1648476566796100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Even for container-based cross compilation use $(CROSS_CC_HAS_*) variables. This makes the TCG test makefiles oblivious of whether the compiler is invoked through a container or not. Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e --- tests/tcg/aarch64/Makefile.softmmu-target | 2 +- tests/tcg/aarch64/Makefile.target | 10 +++++----- tests/tcg/configure.sh | 16 ++++++++++++++++ tests/tcg/i386/Makefile.target | 2 +- tests/tcg/ppc64/Makefile.target | 4 ++-- tests/tcg/ppc64le/Makefile.target | 4 ++-- 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/= Makefile.softmmu-target index a7286ac295..f6fcd4829e 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -64,7 +64,7 @@ run-memory-replay: memory-replay run-memory-record =20 EXTRA_RUNS+=3Drun-memory-replay =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_3),) +ifneq ($(CROSS_CC_HAS_ARMV8_3),) pauth-3: CFLAGS +=3D -march=3Darmv8.3-a else pauth-3: diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile= .target index f7121cb4d8..6ad0ad49f9 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -18,7 +18,7 @@ run-fcvt: fcvt $(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref) =20 # Pauth Tests -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_3),) +ifneq ($(CROSS_CC_HAS_ARMV8_3),) AARCH64_TESTS +=3D pauth-1 pauth-2 pauth-4 pauth-5 pauth-%: CFLAGS +=3D -march=3Darmv8.3-a run-pauth-%: QEMU_OPTS +=3D -cpu max @@ -27,7 +27,7 @@ endif =20 # BTI Tests # bti-1 tests the elf notes, so we require special compiler support. -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_BTI),) +ifneq ($(CROSS_CC_HAS_ARMV8_BTI),) AARCH64_TESTS +=3D bti-1 bti-1: CFLAGS +=3D -mbranch-protection=3Dstandard bti-1: LDFLAGS +=3D -nostdlib @@ -36,12 +36,12 @@ endif AARCH64_TESTS +=3D bti-2 =20 # MTE Tests -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_MTE),) +ifneq ($(CROSS_CC_HAS_ARMV8_MTE),) AARCH64_TESTS +=3D mte-1 mte-2 mte-3 mte-4 mte-5 mte-6 mte-7 mte-%: CFLAGS +=3D -march=3Darmv8.5-a+memtag endif =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_SVE),) +ifneq ($(CROSS_CC_HAS_SVE),) # System Registers Tests AARCH64_TESTS +=3D sysregs sysregs: CFLAGS+=3D-march=3Darmv8.1-a+sve @@ -88,7 +88,7 @@ EXTRA_RUNS +=3D run-gdbstub-sysregs run-gdbstub-sve-ioctls endif endif =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_SVE2),) +ifneq ($(CROSS_CC_HAS_SVE2),) AARCH64_TESTS +=3D test-826 test-826: CFLAGS+=3D-march=3Darmv8.1-a+sve2 endif diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 84f928f7f8..0162b2f6c4 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -350,5 +350,21 @@ for target in $target_list; do fi fi done + case $target in + aarch64-*) + echo "CROSS_CC_HAS_SVE=3Dy" >> $config_target_mak + echo "CROSS_CC_HAS_SVE2=3Dy" >> $config_target_mak + echo "CROSS_CC_HAS_ARMV8_3=3Dy" >> $config_target_mak + echo "CROSS_CC_HAS_ARMV8_BTI=3Dy" >> $config_target_mak + echo "CROSS_CC_HAS_ARMV8_MTE=3Dy" >> $config_target_mak + ;; + ppc*) + echo "CROSS_CC_HAS_POWER8_VECTOR=3Dy" >> $config_target_mak + echo "CROSS_CC_HAS_POWER10=3Dy" >> $config_target_mak + ;; + i386-linux-user) + echo "CROSS_CC_HAS_I386_NOPIE=3Dy" >> $config_target_mak + ;; + esac fi done diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index e1c0310be6..bd73c96d0d 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -30,7 +30,7 @@ hello-i386: LDFLAGS+=3D-nostdlib # test-386 includes a couple of additional objects that need to be # linked together, we also need a no-pie capable compiler due to the # non-pic calls into 16-bit mode -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_I386_NOPIE),) +ifneq ($(CROSS_CC_HAS_I386_NOPIE),) test-i386: CFLAGS +=3D -fno-pie =20 test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S test-i386.h tes= t-i386-shift.h test-i386-muldiv.h diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.tar= get index 8197c288a7..babd209573 100644 --- a/tests/tcg/ppc64/Makefile.target +++ b/tests/tcg/ppc64/Makefile.target @@ -5,14 +5,14 @@ VPATH +=3D $(SRC_PATH)/tests/tcg/ppc64 VPATH +=3D $(SRC_PATH)/tests/tcg/ppc64le =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER8_VECTOR),) +ifneq ($(CROSS_CC_HAS_POWER8_VECTOR),) PPC64_TESTS=3Dbcdsub non_signalling_xscv endif $(PPC64_TESTS): CFLAGS +=3D -mpower8-vector =20 PPC64_TESTS +=3D mtfsf =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER10),) +ifneq ($(CROSS_CC_HAS_POWER10),) PPC64_TESTS +=3D byte_reverse sha512-vector endif byte_reverse: CFLAGS +=3D -mcpu=3Dpower10 diff --git a/tests/tcg/ppc64le/Makefile.target b/tests/tcg/ppc64le/Makefile= .target index 9624bb1e9c..5b0eb5e870 100644 --- a/tests/tcg/ppc64le/Makefile.target +++ b/tests/tcg/ppc64le/Makefile.target @@ -4,12 +4,12 @@ =20 VPATH +=3D $(SRC_PATH)/tests/tcg/ppc64le =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER8_VECTOR),) +ifneq ($(CROSS_CC_HAS_POWER8_VECTOR),) PPC64LE_TESTS=3Dbcdsub non_signalling_xscv endif $(PPC64LE_TESTS): CFLAGS +=3D -mpower8-vector =20 -ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_POWER10),) +ifneq ($(CROSS_CC_HAS_POWER10),) PPC64LE_TESTS +=3D byte_reverse sha512-vector endif byte_reverse: CFLAGS +=3D -mcpu=3Dpower10 --=20 2.31.1 From nobody Mon Feb 9 10:40:03 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=1648476812; cv=none; d=zohomail.com; s=zohoarc; b=iQK4CskAGmZXnrzQL0PLxamaOKkFXTEGd3x1vQSjdM+KyMfl5F3tW7x7/nkRnt7/0dYxGFkaAtVzSDfJdVCR0fgWREqamTTTbBwUI/gipszEaGqeu67/9J4KtCio/EtFwxmuSDaT2PurxKS+SF9uCUqPRYnN1WXUXUzJWszgSrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648476812; 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=vUKEhOLmQYygLsYrpMsrIXKdNdC6DWL4JkWJkk0N104=; b=av/gNOodFF52i2WtCFrqUwKyaFvE+hp/TJCOQALGHFI9Kb/rxQYElQ+e9058qRaekWAZYHGoNTEpLQ529Oehb+c/h34e+J0kITdbULjnyLTaoixWy7QejyDEx9M29uwTjc1E3sslyO6eM56wVV5QRtlkq/T7WzQVkTf+AT3z76E= 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 1648476812666823.0999838194159; Mon, 28 Mar 2022 07:13:32 -0700 (PDT) Received: from localhost ([::1]:50124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYq7e-0007xs-2p for importer@patchew.org; Mon, 28 Mar 2022 10:13:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxL-0001kG-2r 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]:57889) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxG-0004jv-Aa for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:50 -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-30-TtFVqqQ6PEesStwn8aReow-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 EB77A2805529; Mon, 28 Mar 2022 14:02:41 +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 D3A5D1121322; Mon, 28 Mar 2022 14:02:41 +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=vUKEhOLmQYygLsYrpMsrIXKdNdC6DWL4JkWJkk0N104=; b=RBZXlH2cCYy2TiNQKDaZPPfMRhGVAo/TP682hZ8W9nikh6L7zOOKEWeufp0ihnA5Nc+M39 qvgESYmbhl/BXxEEY4ElxHBpxGAEVZQJen8eOrSj7Sf2g7OJ8kVrIsZ/FQSKB37m0gAxBR +0Gf6gafim3ASzsGoX1lo80UqgtyxnQ= X-MC-Unique: TtFVqqQ6PEesStwn8aReow-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 09/15] tests/tcg: remove CONFIG_LINUX_USER from config-target.mak Date: Mon, 28 Mar 2022 10:02:34 -0400 Message-Id: <20220328140240.40798-10-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: 1648476814848100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Just check the target name instead. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/tcg/configure.sh | 2 -- tests/tcg/multiarch/Makefile.target | 2 +- tests/tcg/x86_64/Makefile.target | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 0162b2f6c4..b09956c14d 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -227,12 +227,10 @@ for target in $target_list; do case $target in *-linux-user) echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak - echo "CONFIG_LINUX_USER=3Dy" >> $config_target_mak echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak ;; *-bsd-user) echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak - echo "CONFIG_BSD_USER=3Dy" >> $config_target_mak echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak ;; *-softmmu) diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Make= file.target index dec401e67f..6bba523729 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -10,7 +10,7 @@ MULTIARCH_SRC=3D$(SRC_PATH)/tests/tcg/multiarch # Set search path for all sources VPATH +=3D $(MULTIARCH_SRC) MULTIARCH_SRCS =3D $(notdir $(wildcard $(MULTIARCH_SRC)/*.c)) -ifneq ($(CONFIG_LINUX_USER),) +ifeq ($(filter %-linux-user, $(TARGET)),$(TARGET)) VPATH +=3D $(MULTIARCH_SRC)/linux MULTIARCH_SRCS +=3D $(notdir $(wildcard $(MULTIARCH_SRC)/linux/*.c)) endif diff --git a/tests/tcg/x86_64/Makefile.target b/tests/tcg/x86_64/Makefile.t= arget index 17cf168f0a..f9fcd31caf 100644 --- a/tests/tcg/x86_64/Makefile.target +++ b/tests/tcg/x86_64/Makefile.target @@ -8,7 +8,7 @@ =20 include $(SRC_PATH)/tests/tcg/i386/Makefile.target =20 -ifneq ($(CONFIG_LINUX_USER),) +ifeq ($(filter %-linux-user, $(TARGET)),$(TARGET)) X86_64_TESTS +=3D vsyscall TESTS=3D$(MULTIARCH_TESTS) $(X86_64_TESTS) test-x86_64 else --=20 2.31.1 From nobody Mon Feb 9 10:40:03 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=1648476808; cv=none; d=zohomail.com; s=zohoarc; b=bOqKpMR/xP1rTQaOFfV5wkyXN0et4GkiWn1IaIwaowYLITHvOTeZ28oCUChz8m29eyX36AIEqsei5sWMjrXo7qyzwETMy9o/Qd8uNferHRROiqZUqvTKt0y/vXwkLTKCYhppckLGRR2TGwoDoB4Ih84tdGt42VgLUAGERU9cfX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648476808; 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=fYZwtxJx1KTt808SLTj8mlOncqUzb/TqWSg4OJZ+FQE=; b=PZkhNsVlv3oFamPH94gXammROXl7Qoc/ATGfmSOH42yDFirWfcPtrQAUqqIEapDcAA6NlBUo6LWZWaUu8kwZDVGcx3ql29Dj30WWsDFnbljlnIjHHASUJHN092W0FHCGP4BI3nvscK+h/lcMJdM09yXLHeUntT8bEGtetMrSzBQ= 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 1648476808504597.5236264217929; Mon, 28 Mar 2022 07:13:28 -0700 (PDT) Received: from localhost ([::1]:50070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYq7b-0007vO-A0 for importer@patchew.org; Mon, 28 Mar 2022 10:13:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxM-0001kb-7R for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:35350) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxG-0004jy-C2 for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:50 -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-368-L8Pvua7FPzSQPjPg0Dwb5Q-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 2D3DE280552F; 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 140F71121321; 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=fYZwtxJx1KTt808SLTj8mlOncqUzb/TqWSg4OJZ+FQE=; b=LF5kjnruvyKjWq8sH0yqURXqrlPGxgxBSdHAhzOmsOxmhl6r6j0+2uGihuwNwoeAL+l/TT ggqy7EOo1kMSF9a8qJd5HQnrsA6aO4GVjPnq4IytvleWfTAvJwDstMy6uNwPMvotOHbnbh +earQdahujIjXl2ikmzEsewJkLZuHyU= X-MC-Unique: L8Pvua7FPzSQPjPg0Dwb5Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 10/15] tests/tcg: remove CONFIG_USER_ONLY from config-target.mak Date: Mon, 28 Mar 2022 10:02:35 -0400 Message-Id: <20220328140240.40798-11-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: 1648476809190100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Just check the target name instead. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/tcg/Makefile.target | 8 ++++---- tests/tcg/configure.sh | 12 +++--------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index ae8004c76e..083b09c742 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -32,7 +32,7 @@ all: -include ../../../config-host.mak -include ../config-$(TARGET).mak -ifeq ($(CONFIG_USER_ONLY),y) +ifeq ($(filter %-softmmu, $(TARGET)),) -include $(SRC_PATH)/configs/targets/$(TARGET)/default.mak endif =20 @@ -42,7 +42,7 @@ COMMA :=3D , quiet-command =3D $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1= , @$1)) =20 # $1 =3D test name, $2 =3D cmd, $3 =3D desc -ifdef CONFIG_USER_ONLY +ifeq ($(filter %-softmmu, $(TARGET)),) run-test =3D $(call quiet-command, timeout --foreground $(TIMEOUT) $2 > $1= .out, \ "TEST",$3) else @@ -89,7 +89,7 @@ QEMU_OPTS=3D # 90s with --enable-tcg-interpreter TIMEOUT=3D90 =20 -ifdef CONFIG_USER_ONLY +ifeq ($(filter %-softmmu, $(TARGET)),) # The order we include is important. We include multiarch first and # then the target. If there are common tests shared between # sub-targets (e.g. ARM & AArch64) then it is up to @@ -151,7 +151,7 @@ extract-plugin =3D $(wordlist 2, 2, $(subst -with-, ,$1= )) =20 RUN_TESTS+=3D$(EXTRA_RUNS) =20 -ifdef CONFIG_USER_ONLY +ifeq ($(filter %-softmmu, $(TARGET)),) run-%: % $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") =20 diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index b09956c14d..a17db8ce64 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -225,18 +225,12 @@ for target in $target_list; do echo "TARGET_NAME=3D$arch" >> $config_target_mak echo "target=3D$target" >> $config_target_mak case $target in - *-linux-user) - echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak - echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak - ;; - *-bsd-user) - echo "CONFIG_USER_ONLY=3Dy" >> $config_target_mak - echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak - ;; *-softmmu) - echo "CONFIG_SOFTMMU=3Dy" >> $config_target_mak echo "QEMU=3D$PWD/qemu-system-$arch" >> $config_target_mak ;; + *) + echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak + ;; esac =20 eval "target_compiler_cflags=3D\${cross_cc_cflags_$arch}" --=20 2.31.1 From nobody Mon Feb 9 10:40:03 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=1648477096; cv=none; d=zohomail.com; s=zohoarc; b=Vn6xONOQWek+TI3ZZ9ptVQRSAE1Oq9AMWjcPfj+0Lg/ThyWe9vsViUQHyavrbm/pm4PXdGgYSVE4RFsLi2dTL8idS+nMVpS3oCV/3diAllRBLgOqFiJIkI6xqawLoevnpPySwwjtdSpm94IPynFClXaEsSbkz0z246Q835LIBQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648477096; 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=XHu35xixtOXF2QZwH4fi0BxlwmUduhoXGGqYHt4rBM0=; b=hGL3VYzqzFWTrm4SHbDJa4HIZY6FKCbs9X6RX15vZ7sNxgWMj15QhA+pCYVhZstiI5pUR3rssJhPTUKb/csj9MGXiu75BfnRBiH01nARCiwTcMot1M/cAu/X7bAzpqoSx3jXfv8rt5yWgPBMMuE+5OJSKyDkWnGJ9TtOwIm8fTI= 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 164847709675180.39175761783633; Mon, 28 Mar 2022 07:18:16 -0700 (PDT) Received: from localhost ([::1]:58348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYqCF-0005GI-9U for importer@patchew.org; Mon, 28 Mar 2022 10:18:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40712) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxO-0001vD-VK for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:36863) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxH-0004kF-7m for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:54 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-28-dWSsC3FGMZOUG2B7TNV5Lg-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 4EAAC100BABE; 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 35AAC1121321; 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=1648476166; 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=XHu35xixtOXF2QZwH4fi0BxlwmUduhoXGGqYHt4rBM0=; b=GtAW/i8YeB+YTCHhNGDiBUOAnfW0NJoUoy9+fTmSkygCFFWTCCF1W3MQ6O+G8OBk8gGJaU 7rOo3iAWQoqiwMkMt455R+kETdphuL8v9N44a4bPMnH4x79xoP0UmMP0f0DcCyBZD53B9e C8tfcuvUoLQWKK84CueheDVaXMODGeE= X-MC-Unique: dWSsC3FGMZOUG2B7TNV5Lg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 11/15] tests/tcg: prepare Makefile.prereqs at configure time Date: Mon, 28 Mar 2022 10:02:36 -0400 Message-Id: <20220328140240.40798-12-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: 1648477097199100004 Content-Type: text/plain; charset="utf-8"; x-default="true" List the dependencies of the build-tcg-tests-* and run-tcg-tests-* targets in a Makefile fragment, without going through Makefile.prereqs's "parsing" of config-*.mak. Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 9 ++++++--- tests/tcg/Makefile.prereqs | 18 ------------------ tests/tcg/configure.sh | 11 +++++++++-- 3 files changed, 15 insertions(+), 23 deletions(-) delete mode 100644 tests/tcg/Makefile.prereqs diff --git a/tests/Makefile.include b/tests/Makefile.include index 05c534ea56..b5d0d6bc98 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -39,14 +39,17 @@ SPEED =3D quick # Build up our target list from the filtered list of ninja targets TARGETS=3D$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targe= ts))) =20 +-include tests/tcg/Makefile.prereqs +config-host.mak: $(SRC_PATH)/tests/tcg/configure.sh +tests/tcg/Makefile.prereqs: config-host.mak + # 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)) =20 -# Probe for the Docker Builds needed for each build -$(foreach PROBE_TARGET,$(TARGET_DIRS), \ - $(eval -include $(SRC_PATH)/tests/tcg/Makefile.prereqs)) +$(foreach TARGET,$(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) $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ diff --git a/tests/tcg/Makefile.prereqs b/tests/tcg/Makefile.prereqs deleted file mode 100644 index 9a29604a83..0000000000 --- a/tests/tcg/Makefile.prereqs +++ /dev/null @@ -1,18 +0,0 @@ -# -*- Mode: makefile -*- -# -# TCG Compiler Probe -# -# This Makefile fragment is included multiple times in the main make -# script to probe for available compilers. This is used to build up a -# selection of required docker targets before we invoke a sub-make for -# each target. - -DOCKER_IMAGE:=3D - --include $(BUILD_DIR)/tests/tcg/config-$(PROBE_TARGET).mak - -ifneq ($(DOCKER_IMAGE),) -build-tcg-tests-$(PROBE_TARGET): docker-image-$(DOCKER_IMAGE) -endif -$(BUILD_DIR)/tests/tcg/config_$(PROBE_TARGET).mak: config-host.mak -config-host.mak: $(SRC_PATH)/tests/tcg/configure.sh diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index a17db8ce64..991b905354 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -80,6 +80,8 @@ fi : ${cross_as_tricore=3D"tricore-as"} : ${cross_ld_tricore=3D"tricore-ld"} =20 +makefile=3Dtests/tcg/Makefile.prereqs +: > $makefile for target in $target_list; do arch=3D${target%%-*} =20 @@ -226,14 +228,17 @@ for target in $target_list; do echo "target=3D$target" >> $config_target_mak case $target in *-softmmu) - echo "QEMU=3D$PWD/qemu-system-$arch" >> $config_target_mak + qemu=3D"qemu-system-$arch" ;; *) - echo "QEMU=3D$PWD/qemu-$arch" >> $config_target_mak + qemu=3D"qemu-$arch" ;; 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 @@ -329,6 +334,7 @@ for target in $target_list; do test -n "$container_image"; then for host in $container_hosts; do if test "$host" =3D "$cpu"; then + echo "build-tcg-tests-$target: docker-image-$container_image= " >> $makefile echo "DOCKER_IMAGE=3D$container_image" >> $config_target_mak echo "DOCKER_CROSS_CC_GUEST=3D$container_cross_cc" >> \ $config_target_mak @@ -340,6 +346,7 @@ for target in $target_list; do echo "DOCKER_CROSS_LD_GUEST=3D$container_cross_ld" >> \ $config_target_mak fi + break fi done case $target in --=20 2.31.1 From nobody Mon Feb 9 10:40:03 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 From nobody Mon Feb 9 10:40:03 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=1648476807; cv=none; d=zohomail.com; s=zohoarc; b=h9tDW4iDLvovGqRrHPfToGaua+PSLKqe4hxYFAwbEO4meFK+yTMtZFhebsGCDNaNGEn3LYAFGSCzhqfkV4tIq/0PuJ/uo7GO/8K9dwFHokGpjty3XF12ccL8xAqSBjU1PKGNTKPXQ1Kc3DAKncrHJ69FEoS7uMMlwQsJsAjTF1c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648476807; 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=3MCxxax9wq8kNEPq5EpixvBBE6JvifmLwRPXsQ37P8g=; b=E3x3yf546x2Lk7cCYO+2V1KdbIw6k9wglEBXly/bUMX65wOiEuW+Wc4b8QHQBwQkYO80YfhEs40/b4ubr+8ygZiJFamaiLcPq2yakqxyx5wJlfcDFXYmILl4rcTsxyy92OIH+hXBgarjRW4DKCLOp6Y0XJGzl5dzBqH4Gk9CCtI= 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 1648476807005427.3205277375581; Mon, 28 Mar 2022 07:13:27 -0700 (PDT) Received: from localhost ([::1]:49942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYq7Z-0007pu-1y for importer@patchew.org; Mon, 28 Mar 2022 10:13:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxK-0001j4-Kw for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:31048) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxG-0004jt-70 for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:50 -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-79-4iGG7qE6MTaoVjfv3-bzCQ-1; Mon, 28 Mar 2022 10:02:43 -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 914292A5957B; 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 7893B1121318; 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=3MCxxax9wq8kNEPq5EpixvBBE6JvifmLwRPXsQ37P8g=; b=WE30IRl+2dhHIogrdxAXxBBNSYsmjrDGHb1SzO9izOKaF6KB+9L06ILVOHncZni752WyWO CWE2Ku47KHKBhP7s5ITZ19l6BO+Gbh4M5LXr0D7lC7tWt+EuYWaW5KvW3YheCg9nuA+PwW ECwcKnRCISjClVqe24i58wDX9RLZmYA= X-MC-Unique: 4iGG7qE6MTaoVjfv3-bzCQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 13/15] tests/tcg: invoke Makefile.target directly from QEMU's makefile Date: Mon, 28 Mar 2022 10:02:38 -0400 Message-Id: <20220328140240.40798-14-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.129.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_H4=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: 1648476809233100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Build the "docker.py cc" invocation directly in tests/tcg/configure.sh, and remove the Makefile.qemu wrapper around Makefile.target. The config-*.mak files now include the actual variables used when building the tests, rather than the CROSS_* variables that Makefile.qemu used to "translate". This is a first step towards generalizing the cross-compilation infrastruct= ure so that it can be used for firmware as well. Signed-off-by: Paolo Bonzini --- tests/Makefile.include | 40 +++++++------- tests/tcg/Makefile.qemu | 110 -------------------------------------- tests/tcg/Makefile.target | 3 +- tests/tcg/configure.sh | 28 +++++----- 4 files changed, 35 insertions(+), 146 deletions(-) delete mode 100644 tests/tcg/Makefile.qemu diff --git a/tests/Makefile.include b/tests/Makefile.include index 091ca8513f..ec84b2ebc0 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -48,25 +48,27 @@ RUN_TCG_TARGET_RULES=3D$(patsubst %,run-tcg-tests-%, $(= TCG_TESTS_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) - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ - -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ - SRC_PATH=3D$(SRC_PATH) \ - V=3D"$(V)" TARGET=3D"$*" guest-tests, \ - "BUILD", "TCG tests for $*") - -$(RUN_TCG_TARGET_RULES): run-tcg-tests-%: build-tcg-tests-% all - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ - -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ - SRC_PATH=3D$(SRC_PATH) SPEED=3D"$(SPEED)" \ - V=3D"$(V)" TARGET=3D"$*" run-guest-tests, \ - "RUN", "TCG tests for $*") - -$(CLEAN_TCG_TARGET_RULES): clean-tcg-tests-%: - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) \ - -f $(SRC_PATH)/tests/tcg/Makefile.qemu \ - SRC_PATH=3D$(SRC_PATH) TARGET=3D"$*" clean-guest-tests, \ - "CLEAN", "TCG tests for $*") +.PHONY: $(TCG_TESTS_TARGETS:%=3Dbuild-tcg-tests-%) +$(TCG_TESTS_TARGETS:%=3Dbuild-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR= )/tests/tcg/config-%.mak + $(call quiet-command, \ + $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLA= GS) \ + DOCKER_SCRIPT=3D"$(DOCKER_SCRIPT)" \ + TARGET=3D"$*" SRC_PATH=3D"$(SRC_PATH)", \ + "BUILD","$* guest-tests") + +.PHONY: $(TCG_TESTS_TARGETS:%=3Drun-tcg-tests-%) +$(TCG_TESTS_TARGETS:%=3Drun-tcg-tests-%): run-tcg-tests-%: build-tcg-tests= -% $(if $(CONFIG_PLUGIN),test-plugins) + $(call quiet-command, \ + $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAG= S) \ + TARGET=3D"$*" SRC_PATH=3D"$(SRC_PATH)" SPEED=3D$(S= PEED) run, \ + "RUN", "$* guest-tests") + +.PHONY: $(TCG_TESTS_TARGETS:%=3Dclean-tcg-tests-%) +$(TCG_TESTS_TARGETS:%=3Dclean-tcg-tests-%): clean-tcg-tests-%: + $(call quiet-command, \ + $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAG= S) \ + TARGET=3D"$*" SRC_PATH=3D"$(SRC_PATH)" clean, \ + "CLEAN", "$* guest-tests") =20 .PHONY: build-tcg build-tcg: $(BUILD_TCG_TARGET_RULES) diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu deleted file mode 100644 index cda5e5a33e..0000000000 --- a/tests/tcg/Makefile.qemu +++ /dev/null @@ -1,110 +0,0 @@ -# -*- Mode: makefile -*- -# -# TCG tests (per-target rules) -# -# This Makefile fragment is included from the build-tcg target, once -# for each target we build. We have two options for compiling, either -# using a configured guest compiler or calling one of our docker images -# to do it for us. -# - -# The configure script fills in extra information about -# useful docker images or alternative compiler flags. - -# Usage: $(call quiet-command,command and args,"NAME","args to print") -# This will run "command and args", and either: -# if V=3D1 just print the whole command and args -# otherwise print the 'quiet' output in the format " NAME args to pr= int" -# NAME should be a short name of the command, 7 letters or fewer. -# If called with only a single argument, will print nothing in quiet mode. -quiet-command-run =3D $(if $(V),,$(if $2,printf " %-7s %s\n" $2 $3 && ))$1 -quiet-@ =3D $(if $(V),,@) -quiet-command =3D $(quiet-@)$(call quiet-command-run,$1,$2,$3) - -CROSS_CC_GUEST:=3D -CROSS_AS_GUEST:=3D -CROSS_LD_GUEST:=3D -DOCKER_IMAGE:=3D - --include tests/tcg/config-$(TARGET).mak - -GUEST_BUILD=3D -TCG_MAKE=3D../Makefile.target - -# We also need the Docker make rules to depend on -SKIP_DOCKER_BUILD=3D1 -include $(SRC_PATH)/tests/docker/Makefile.include - -# Support installed Cross Compilers - -ifdef CROSS_CC_GUEST - -.PHONY: cross-build-guest-tests -cross-build-guest-tests: - $(call quiet-command, \ - (mkdir -p tests/tcg/$(TARGET) && cd tests/tcg/$(TARGET) && \ - $(MAKE) -f $(TCG_MAKE) TARGET=3D"$(TARGET)" CC=3D"$(CROSS_CC_GUEST)" \ - $(if $(CROSS_AS_GUEST),AS=3D"$(CROSS_AS_GUEST)") \ - $(if $(CROSS_LD_GUEST),LD=3D"$(CROSS_LD_GUEST)") \ - SRC_PATH=3D"$(SRC_PATH)" BUILD_STATIC=3D$(CROSS_CC_GUEST_STATIC) \ - EXTRA_CFLAGS=3D"$(CROSS_CC_GUEST_CFLAGS)"), \ - "BUILD","$(TARGET) guest-tests with $(CROSS_CC_GUEST)") - -GUEST_BUILD=3Dcross-build-guest-tests - -endif - -# Support building with Docker - -ifneq ($(DOCKER_IMAGE),) - -DOCKER_COMPILE_CMD=3D"$(DOCKER_SCRIPT) cc \ - --cc $(DOCKER_CROSS_CC_GUEST) \ - -i qemu/$(DOCKER_IMAGE) \ - -s $(SRC_PATH) -- " - -DOCKER_AS_CMD=3D$(if $(DOCKER_CROSS_AS_GUEST),"$(DOCKER_SCRIPT) cc \ - --cc $(DOCKER_CROSS_AS_GUEST) \ - -i qemu/$(DOCKER_IMAGE) \ - -s $(SRC_PATH) -- ") - -DOCKER_LD_CMD=3D$(if $(DOCKER_CROSS_LD_GUEST),"$(DOCKER_SCRIPT) cc \ - --cc $(DOCKER_CROSS_LD_GUEST) \ - -i qemu/$(DOCKER_IMAGE) \ - -s $(SRC_PATH) -- ") - - -.PHONY: docker-build-guest-tests -docker-build-guest-tests: docker-image-$(DOCKER_IMAGE) - $(call quiet-command, \ - (mkdir -p tests/tcg/$(TARGET) && cd tests/tcg/$(TARGET) && \ - $(MAKE) -f $(TCG_MAKE) TARGET=3D"$(TARGET)" CC=3D$(DOCKER_COMPILE_CMD)= \ - $(if $(DOCKER_AS_CMD),AS=3D$(DOCKER_AS_CMD)) \ - $(if $(DOCKER_LD_CMD),LD=3D$(DOCKER_LD_CMD)) \ - SRC_PATH=3D"$(SRC_PATH)" BUILD_STATIC=3Dy \ - EXTRA_CFLAGS=3D"$(CROSS_CC_GUEST_CFLAGS)"), \ - "BUILD","$(TARGET) guest-tests with docker qemu/$(DOCKER_IMAGE)") - -GUEST_BUILD=3Ddocker-build-guest-tests - -endif - -# Final targets -all: - @echo "Do not invoke this Makefile directly"; exit 1 - -.PHONY: guest-tests - -guest-tests: $(GUEST_BUILD) - -run-guest-tests: guest-tests - $(call quiet-command, \ - (cd tests/tcg/$(TARGET) && \ - $(MAKE) -f $(TCG_MAKE) TARGET=3D"$(TARGET)" \ - SRC_PATH=3D"$(SRC_PATH)" SPEED=3D$(SPEED) run), \ - "RUN", "tests for $(TARGET_NAME)") - -# It doesn't matter if these don't exits -.PHONY: clean-guest-tests -clean-guest-tests: - rm -rf tests/tcg/$(TARGET) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 083b09c742..24543cc09f 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -185,4 +185,5 @@ gdb-%: % .PHONY: run run: $(RUN_TESTS) =20 -# There is no clean target, the calling make just rm's the tests build dir +clean: + rm -f $(TESTS) *.o diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 05e1ac507b..5c95adfd0d 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -227,7 +227,6 @@ for target in $target_list; do =20 echo "# Automatically generated by configure - do not modify" > $config_= target_mak echo "TARGET_NAME=3D$arch" >> $config_target_mak - echo "target=3D$target" >> $config_target_mak case $target in *-softmmu) test -f $source_path/tests/tcg/$arch/Makefile.softmmu-target || cont= inue @@ -257,13 +256,13 @@ for target in $target_list; do if do_compiler "$target_compiler" $target_compiler_cflag= s \ -o $TMPE $TMPC ; then got_cross_cc=3Dyes - echo "CROSS_CC_GUEST_STATIC=3Dy" >> $config_target_m= ak - echo "CROSS_CC_GUEST=3D$target_compiler" >> $config_= target_mak + echo "BUILD_STATIC=3Dy" >> $config_target_mak + echo "CC=3D$target_compiler" >> $config_target_mak fi else got_cross_cc=3Dyes - echo "CROSS_CC_GUEST_STATIC=3Dy" >> $config_target_mak - echo "CROSS_CC_GUEST=3D$target_compiler" >> $config_targ= et_mak + echo "BUILD_STATIC=3Dy" >> $config_target_mak + echo "CC=3D$target_compiler" >> $config_target_mak fi fi fi @@ -274,9 +273,8 @@ for target in $target_list; do if has $target_as && has $target_ld; then case $target in tricore-softmmu) - echo "CROSS_CC_GUEST=3D$target_as" >> $config_target_mak - echo "CROSS_AS_GUEST=3D$target_as" >> $config_target_mak - echo "CROSS_LD_GUEST=3D$target_ld" >> $config_target_mak + echo "AS=3D$target_as" >> $config_target_mak + echo "LD=3D$target_ld" >> $config_target_mak got_cross_cc=3Dyes ;; esac @@ -334,16 +332,13 @@ for target in $target_list; do for host in $container_hosts; do if test "$host" =3D "$cpu"; then echo "build-tcg-tests-$target: docker-image-$container_image= " >> $makefile - echo "DOCKER_IMAGE=3D$container_image" >> $config_target_mak - echo "DOCKER_CROSS_CC_GUEST=3D$container_cross_cc" >> \ - $config_target_mak + echo "BUILD_STATIC=3Dy" >> $config_target_mak + echo "CC=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i = qemu/$container_image -s $source_path --" >> $config_target_mak if test -n "$container_cross_as"; then - echo "DOCKER_CROSS_AS_GUEST=3D$container_cross_as" >> \ - $config_target_mak + echo "AS=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_cc= -i qemu/$container_image -s $source_path --" >> $config_target_mak fi if test -n "$container_cross_ld"; then - echo "DOCKER_CROSS_LD_GUEST=3D$container_cross_ld" >> \ - $config_target_mak + echo "LD=3D\$(DOCKER_SCRIPT) cc --cc $container_cross_ld= -i qemu/$container_image -s $source_path --" >> $config_target_mak fi break fi @@ -367,8 +362,9 @@ for target in $target_list; do else continue fi + mkdir -p tests/tcg/$target echo "QEMU=3D$PWD/$qemu" >> $config_target_mak - echo "CROSS_CC_GUEST_CFLAGS=3D$target_compiler_cflags" >> $config_target= _mak + echo "EXTRA_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 --=20 2.31.1 From nobody Mon Feb 9 10:40:03 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=1648476370; cv=none; d=zohomail.com; s=zohoarc; b=MWlMJG0oqI85TJhRKaDGbUa/GC7EZwbXFlk/WoqjUwnOq+I+vmaCatVA7EdNUlbmz8sSZQm96h/1PQOrUo71YKLlioNgEWK27hp9RSAdVPRnvhxaz5uHzAA2BdsoPciM17SzPZbDM2OovlQ+Cm9MLAgwZ5RkFZ2qTSchZk59f/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648476370; 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=Rp4kHG3BA43WbEs98k0XNYRTWeJuW+qwiBg4wQTbDBQ=; b=GcITCYUIIWOS2obLY/sCG5FxJdXj3ht7OdLKXQiaUsQroKkiAqFW+8wa1MG9ws8zMgYQ2/mUo+osWzwHmoEYsx+MTua6RRPGmwJrYwrgJ/7ahvC49TPvOKuJ3gTXVMPjzQ1DzSrnniLyHGxizgaW2saGXCDlVpm9UvwiDPZUH+o= 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 1648476370188895.9099490054073; Mon, 28 Mar 2022 07:06:10 -0700 (PDT) Received: from localhost ([::1]:33610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYq0W-0004f6-MT for importer@patchew.org; Mon, 28 Mar 2022 10:06:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxM-0001mf-22 for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:27080) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxH-0004kN-UQ for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:51 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-307-OMt_brzMMA-ERYT1E5KoUQ-1; Mon, 28 Mar 2022 10:02:44 -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 B19BF801E67; 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 995BA1121318; 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=1648476167; 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=Rp4kHG3BA43WbEs98k0XNYRTWeJuW+qwiBg4wQTbDBQ=; b=YPErTIzNpKV3Q/26zglXBvEDU7wNC7MI+ymLVf6wRXdA0CRb09yznxzci2JNTodBvjQ0nn 5hx8Y14kcJEDJGimzM3RPXt+X56hbeWd1fJ3kDi1EQfyIPajmTPKq1F3e2Clbzlbmm8F/p ejv41IfxGkU8ge1rvcXQUzgczq4zNqI= X-MC-Unique: OMt_brzMMA-ERYT1E5KoUQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 14/15] tests/docker: remove SKIP_DOCKER_BUILD Date: Mon, 28 Mar 2022 10:02:39 -0400 Message-Id: <20220328140240.40798-15-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.129.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_H4=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: 1648476371864100005 Content-Type: text/plain; charset="utf-8"; x-default="true" It is now unused. Signed-off-by: Paolo Bonzini --- tests/docker/Makefile.include | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e1bea20451..1b10585f28 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -33,15 +33,7 @@ $(DOCKER_SRC_COPY): =20 docker-qemu-src: $(DOCKER_SRC_COPY) =20 -# General rule for building docker images. If we are a sub-make -# invoked with SKIP_DOCKER_BUILD we still check the image is up to date -# though -ifdef SKIP_DOCKER_BUILD -docker-image-%: $(DOCKER_FILES_DIR)/%.docker - $(call quiet-command, \ - $(DOCKER_SCRIPT) check --quiet qemu/$* $<, \ - "CHECK", "$*") -else +# General rule for building docker images. docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(call quiet-command,\ $(DOCKER_SCRIPT) build -t qemu/$* -f $< \ @@ -77,8 +69,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-= bootstrap.docker { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) =20 -endif - # Enforce dependencies for composite images # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 --=20 2.31.1 From nobody Mon Feb 9 10:40:03 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=1648476931; cv=none; d=zohomail.com; s=zohoarc; b=MSDsmquFJ0E1q5MHATFxW1Ks1vAW/dshziaY9fAe/XuWh+5u2m6AIgC3hdChc04q85RpJBAiODcG29VoDS+KUlxLFtJcvnT9eImGmFwUxzWXDVHhf5d5AZyIlZcoyDLRYaVgW0XoAKt6g0uNIYUy3qjc9UGyA8NaOSr294kKWds= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1648476931; 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=P0h+60Q9uJbRHJejdQZdLbVsnn8VyF3ypIg+1YYUdec=; b=PpFIyeUE86trkF3kuKx38J2YhKPwnLAnCZ/9kL1EMtpEoDnud+GGWE5r5Y5Z0965yNPP97nu5XsKuvg7y70Lthsse5mSU2bUXw99GZyDvnpU0l4oD9rWbRGKse7hWgYoba0BWqok9HFovbVVViBA1jLHQVMVZlC7uUAPk4eCjes= 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 1648476931652270.1539465924884; Mon, 28 Mar 2022 07:15:31 -0700 (PDT) Received: from localhost ([::1]:52972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nYq9a-0001Wa-4v for importer@patchew.org; Mon, 28 Mar 2022 10:15:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxL-0001mP-W5 for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:40777) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nYpxF-0004jS-Fo for qemu-devel@nongnu.org; Mon, 28 Mar 2022 10:02:51 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-486-oxGS00zjPBGK958sf-K8lg-1; Mon, 28 Mar 2022 10:02:43 -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 D28A0801E80; 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 B9E561121318; 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=1648476164; 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=P0h+60Q9uJbRHJejdQZdLbVsnn8VyF3ypIg+1YYUdec=; b=PTqFVCDl5Is0isKwFVRSiUXyfxrKeUJ8bNu3x1HV1yaiFO9YMO3hMjhTwwXxRm3Zr5SbZX eokYq7AXElqo3DG77SJ4fUgXXHX0A1XZrczeVlldB7hoqy+5CX9PL8mEfb9ltgYXRqTH8P DCSv66PUzRqsp8DALToRLhUCADahzY8= X-MC-Unique: oxGS00zjPBGK958sf-K8lg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 15/15] tests/tcg: fix non-static build Date: Mon, 28 Mar 2022 10:02:40 -0400 Message-Id: <20220328140240.40798-16-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: 1648476934115100001 Content-Type: text/plain; charset="utf-8"; x-default="true" If linking with -static fails at configure time, -static should not be used at build time either. Do not include BUILD_STATIC in $config_target_mak. Signed-off-by: Paolo Bonzini --- tests/tcg/configure.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 5c95adfd0d..f195d2d873 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -256,7 +256,6 @@ for target in $target_list; do if do_compiler "$target_compiler" $target_compiler_cflag= s \ -o $TMPE $TMPC ; then got_cross_cc=3Dyes - echo "BUILD_STATIC=3Dy" >> $config_target_mak echo "CC=3D$target_compiler" >> $config_target_mak fi else --=20 2.31.1