From nobody Sat Apr 20 15:14:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1685010597; cv=none; d=zohomail.com; s=zohoarc; b=FDa1xbSnv/w69VhuV/Z26uUDR2/elpNrL/o+jBfOP1hLSl8C0lIYPzwE7HPkrFTA9gNIYe/y4O2vbutL13PWLoneGCfeVtEIcB7ri2YpWpbpBbvHhecYpYV2oj3U2S1wKEwxWWpF7P/9ZvOM0UOThbryxvcXXaakWwsXyyYuKE8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685010597; 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=OZCrtTv/I0pTmPaDIW2c3+cGEqE7OPGdWrlUNQsNPHg=; b=gS0OSdPmONyCM6IXxSnc9Q6CP7BOqYrqF8M7t6O37oLGNHMQusMtfjUsrW3BW6oOI0tzceK1ZMPbXWMAGRHQTc3VrENJQ03kLieMs1ZUrlpMcrUIAVt97Tj/xBr6QV0L3UhQDaI8MEzghfGb/QaGMs76/4O1x+WlaCLrkC2owiE= 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 1685010597804232.349883726779; Thu, 25 May 2023 03:29:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q28DH-0007lU-Bt; Thu, 25 May 2023 06:28:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q28DF-0007ks-4S for qemu-devel@nongnu.org; Thu, 25 May 2023 06:28:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q28DD-0000pN-O4 for qemu-devel@nongnu.org; Thu, 25 May 2023 06:28:52 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-393-Ru0oyDGROGCWwRrD0xyUlw-1; Thu, 25 May 2023 06:28:49 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-96faa650a3fso60957466b.0 for ; Thu, 25 May 2023 03:28:48 -0700 (PDT) Received: from [192.168.10.117] ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id j13-20020a170906254d00b0096a6be0b66dsm648856ejb.208.2023.05.25.03.28.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 03:28:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685010530; 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=OZCrtTv/I0pTmPaDIW2c3+cGEqE7OPGdWrlUNQsNPHg=; b=RCbK34bLGVYWmmWGPQtOZ1OZDksJr7Cq8h1YW3XxIJP8hwodFwTdfb5ZrUO9COv7o0RLjy 6rxePAvoR+aPXkNe9WEQRvJrdCeSdZ1h/Pja3ngy/wXy4nFFELaZ/oRjXC4MaSu7QLee5t 8+tQS7WNBWCzF/rYfYo1ceuu3vfDjOk= X-MC-Unique: Ru0oyDGROGCWwRrD0xyUlw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685010527; x=1687602527; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OZCrtTv/I0pTmPaDIW2c3+cGEqE7OPGdWrlUNQsNPHg=; b=AyhPMBpXTFoZ3TC4rwpdxKOum3kR8btHg1VM4+iW3lLjgrdXBOn1P803JmWpv1HqdM YgntJBK9FiaChVfDzsYWquR59yiLUtvQAO+fU+XmAGAwap5riookh+AJtaxikh4nPL7/ TADjAETua34OT3M/VutJtk1GATvSoY2x0Vk7S0Lq1+XpVUYmnmx34c/nVCDoeh/OW6vc wFwGkij2iwZNB2L/FLIDdq6zI7l41qM6GFM4pYd8MeF4sEh+VyLLkO3qlSuF5jhbPHYY QhoNltSlNZo/Ri0q8AeWI53gTj758zJyGa4MnhDDy1D+HUo399u9wcpWMN5X8CdYS2jO G4FQ== X-Gm-Message-State: AC+VfDzcPzCw59Wot0rTyF2ldOxKU3GpowHhxMrLE+5y28eQSUCz/ZBj z/BnwXYOwYW8efhCwaSlsNfa1y3WXWVabl9d++meOCg00pV7uzUIf7VohrZ1rcZknO+IPYDUbTU 6Hco2xEs2R70zeZVhAKhTEYbVZ+yHQauYku3rtM9dyHFqu3ZcHvU7NVJIVHuLWRJquiLfDDPg5x M= X-Received: by 2002:a17:907:720a:b0:966:5035:6973 with SMTP id dr10-20020a170907720a00b0096650356973mr1064983ejc.50.1685010527470; Thu, 25 May 2023 03:28:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4ekcBI5pSn/2Sq8PvkdNOv1MH4fxkkrHmPKgJIzFRBszycY6icazRiE8ei5ZQq8O3C+Lm18Q== X-Received: by 2002:a17:907:720a:b0:966:5035:6973 with SMTP id dr10-20020a170907720a00b0096650356973mr1064968ejc.50.1685010527130; Thu, 25 May 2023 03:28:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, jsnow@redhat.com Subject: [PATCH 1/3] tests/docker: simplify HOST_ARCH definition Date: Thu, 25 May 2023 12:28:42 +0200 Message-Id: <20230525102844.209240-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230525102844.209240-1-pbonzini@redhat.com> References: <20230525102844.209240-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1685010598486100001 Content-Type: text/plain; charset="utf-8" ARCH is always empty, so just define HOST_ARCH as the result of uname. Signed-off-by: Paolo Bonzini Acked-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- 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 94015253254c..142e8605eee9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -6,7 +6,7 @@ NULL :=3D SPACE :=3D $(NULL) # COMMA :=3D , =20 -HOST_ARCH =3D $(if $(ARCH),$(ARCH),$(shell uname -m)) +HOST_ARCH =3D $(shell uname -m) USER =3D $(if $(NOUSER),,$(shell id -un)) UID =3D $(if $(NOUSER),,$(shell id -u)) =20 --=20 2.40.1 From nobody Sat Apr 20 15:14:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1685010602; cv=none; d=zohomail.com; s=zohoarc; b=N7o6OJihYjKUCys6b+NsZx7QVgIvgk/uP0lNzmIHDMDzaBL5tlIJvpPdDuIlz9G7A+L0gLixFETB4PldXauOmpklNSbj/hA2LbBQdC7wIGEgStNqNumzAN8CrfBeAaesdH7rPEKHO1hT5J5RWHP+vL6nqvNQvBwB/notxZe/zMw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685010602; 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=m4WhpL759GeQFwOeDPAbLwrIB8McDQfK5U7xw7OO2GI=; b=iGZoDyxGoI7B1VWr5K590VlmsQUIuzdsRf4Im9/fkf/l+UcKgAmlcBZrCUQoCJ7/oiCwJH8MB1hZ51H45B0HAfVi7XzLgISgCMiwM7q7JgJjosdBSk1Ip1h5qCrSCNiIozuKjVfQ4iUeiSLJ3illKSZoEVDFSSjln+DH4Lita+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 1685010602662540.011258637493; Thu, 25 May 2023 03:30:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q28DI-0007lj-48; Thu, 25 May 2023 06:28:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q28DG-0007lH-Jy for qemu-devel@nongnu.org; Thu, 25 May 2023 06:28:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q28DF-0000pf-5j for qemu-devel@nongnu.org; Thu, 25 May 2023 06:28:54 -0400 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-632-ENrImTnEOOKeGNDjfwvVUQ-1; Thu, 25 May 2023 06:28:50 -0400 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-96fffd1ba46so46622066b.0 for ; Thu, 25 May 2023 03:28:50 -0700 (PDT) Received: from [192.168.10.117] ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id bq13-20020a170906d0cd00b00965c6c63ea3sm661774ejb.35.2023.05.25.03.28.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 03:28:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685010532; 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=m4WhpL759GeQFwOeDPAbLwrIB8McDQfK5U7xw7OO2GI=; b=LI9tCszK7neoYw0U5HmDnItLoZft2YEfMLiEgqJhokGg55yzwA068l5hgLxjEWgg4At00z ZOeBktdBAEQuTMmKafwqINjzc3tNptdJIZs28STzqTEzarGxYJOXotM90nHONJqb8EWuFC WlqwJ4Omh/nO7m2SuNCF6s72QT/zfuU= X-MC-Unique: ENrImTnEOOKeGNDjfwvVUQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685010529; x=1687602529; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m4WhpL759GeQFwOeDPAbLwrIB8McDQfK5U7xw7OO2GI=; b=DiAnIyZFe7kBYk7Mj3b/UrSrW0P8uQTA5vpT7NkhgiEL0D1SlF+FoZYMUAvxfjMOhW pNE+/wyxFhiZjLuPNPdxg5zJnO158ih1gENNzIANiTw3OpgL5n2c7jlyBhcpNOqCbpZF VwvYXk0ijSpl81feiMqN7PmoMJtc0NSPL19TSbO41LpRCdJlsilOALpnfCD7q54XTKuW k21Wpdmk8c8c2OgsAd2xw8vT7N4d+rmWs0s+hPQn6mtjgvsGxCoZQmB2ubhmAC88duoM aOFvZn9WWwgsx7PAq25rVl4ro7O5VwcD3weM7bb1afvdgFC3y01siIvQQWQlXNSuLopW Ld6Q== X-Gm-Message-State: AC+VfDzSSdN8KWDSotB1RNXMBYWBCZIH0NkN6spK73NvrMj2mAGo9s4S 3rlzliQWA1TAkh3r+qHs1jfN4gk9dATQnHIP1UdmleDTWbElIAj+n05L9nBLBk/IFo8tk99cpEM HFxdhZLZhC2zAW3TjvcD+OnFFSSHElCBc1ndxFu4OQlaGc16sCGuLNsol9f2X8ZbBK9JFkx2ho+ w= X-Received: by 2002:a17:907:3f0a:b0:96a:4ea0:a1ea with SMTP id hq10-20020a1709073f0a00b0096a4ea0a1eamr1022302ejc.44.1685010529129; Thu, 25 May 2023 03:28:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4LrxSN/mWx31hSkZ8xS6V+RKf9G7wC16Ecz3FJtK7zUZoKf3/tcxAbxj2I5AH8kR7rBxbtkA== X-Received: by 2002:a17:907:3f0a:b0:96a:4ea0:a1ea with SMTP id hq10-20020a1709073f0a00b0096a4ea0a1eamr1022290ejc.44.1685010528852; Thu, 25 May 2023 03:28:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, jsnow@redhat.com Subject: [PATCH 2/3] tests/vm: fix and simplify HOST_ARCH definition Date: Thu, 25 May 2023 12:28:43 +0200 Message-Id: <20230525102844.209240-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230525102844.209240-1-pbonzini@redhat.com> References: <20230525102844.209240-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1685010604822100003 Content-Type: text/plain; charset="utf-8" ARCH is always empty, so just define HOST_ARCH as the result of uname. The incorrect definition was not being used because the "ifeq" statement is wrong; replace it with the same idiom based on $(realpath) that the main Makefile uses. With this change, vm-build-netbsd in a configured tree will not use the PYTHONPATH hack. Reported-by: John Snow Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e --- tests/vm/Makefile.include | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 2cc2203d0916..c2a8ca1c175a 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -1,14 +1,12 @@ # Makefile for VM tests =20 # Hack to allow running in an unconfigured build tree -ifeq ($(wildcard $(SRC_PATH)/config-host.mak),) +ifeq ($(realpath $(SRC_PATH)),$(realpath .)) VM_PYTHON =3D PYTHONPATH=3D$(SRC_PATH)/python /usr/bin/env python3 VM_VENV =3D -HOST_ARCH :=3D $(shell uname -m) else VM_PYTHON =3D $(TESTS_PYTHON) VM_VENV =3D check-venv -HOST_ARCH =3D $(ARCH) endif =20 .PHONY: vm-build-all vm-clean-all @@ -23,6 +21,7 @@ ARM64_IMAGES +=3D ubuntu.aarch64 centos.aarch64 endif endif =20 +HOST_ARCH =3D $(shell uname -m) ifeq ($(HOST_ARCH),x86_64) IMAGES=3D$(X86_IMAGES) $(if $(USE_TCG),$(ARM64_IMAGES)) else ifeq ($(HOST_ARCH),aarch64) --=20 2.40.1 From nobody Sat Apr 20 15:14:18 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1685010578; cv=none; d=zohomail.com; s=zohoarc; b=FnrCDROhZPmTNqlkEB8A01vzKtPp/t80APQMlOG8CFZxAi4FY9/7FHTUiKTuFG9BTzTlNlJZuDZF6w9gMuzi9sSTYiu1LhWGxv3mHJCbWvOYAqN/IOFLvnMx9s1ZO3JXhquhAs6GgIHmYJtOuJJtd7Z2Vn8LHuaH4jBK4WWqzz4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685010578; 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=mPawskpfD7SUiGgqDedHsfmhvlO7a1fVJVETqHByam8=; b=cdsAmsJsCn+KjYSmVtoVL+JQR+QgnJXLhaLQrwO3+eRHzBY+F/iWVaF6BDJKTDl6617gPLxVg25xCcH7Wwq4jOUa/kTORq7baCMli+y9Mgv4ACZvKb7uSoN3b9/w/UM83KIu1WLvgb5Eb6cofC3oKcryAtOXpI65REMUJTsVeMQ= 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 168501057883867.70669682322682; Thu, 25 May 2023 03:29:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q28DM-0007mH-FS; Thu, 25 May 2023 06:29:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q28DK-0007m6-Rs for qemu-devel@nongnu.org; Thu, 25 May 2023 06:28:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q28DJ-0000qL-G4 for qemu-devel@nongnu.org; Thu, 25 May 2023 06:28:58 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-505-7h9mHx-EM7OVZ6hghFmcgg-1; Thu, 25 May 2023 06:28:52 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-96f4f1bb838so46624766b.3 for ; Thu, 25 May 2023 03:28:52 -0700 (PDT) Received: from [192.168.10.117] ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id bt22-20020a170906b15600b0096f603dc8ddsm658157ejb.142.2023.05.25.03.28.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 03:28:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685010536; 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=mPawskpfD7SUiGgqDedHsfmhvlO7a1fVJVETqHByam8=; b=gV7z+6rZiwoe9bU/ZNI1CRqvSbiEVGYzP5V2Xl+e/x70bWjdXD5DW49y/f5Qu0ykZRR1jn WsVHlYHMBwSMkCruxUgFGYTKUg/1Xhvg1GSP0+dB8a+fF3Upo34t42q7h0KRrRWXVn81tv TSZEs4zImpACCYpOJDZyOWvS3gzT9k0= X-MC-Unique: 7h9mHx-EM7OVZ6hghFmcgg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685010531; x=1687602531; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mPawskpfD7SUiGgqDedHsfmhvlO7a1fVJVETqHByam8=; b=W+SHDBPlOfke0WVckROtPK1VY/hulFhL/9nCdjqo7WSQ8JvQExAC8sjspVpR1mbmD+ ROscd+VJYOyQ8MOvZidLYbwPv6Juh664qPHtpi4ZONHq3/srwGDjFrpPu/xRJnv3pPKC ordZPYXqhb/nQmf328RXS444RuiwcPUE8bwD0i4gr+EJnJPJvVcLmCcMbWXOICprMt9Q hb7/R40gkOPIe+a/g+X0jhG6YBaYNYbLAGWp7KgioH7eEcXC7eP4T9bSHD6ail5aZyeK vVevl28S2f0f2BKbxfm3jERS95hhLOAZjHKmSToV3Dr59Ho+UCoFfCcL8Wv6N3n4e322 in0Q== X-Gm-Message-State: AC+VfDxIYC6Xw75YFLqPDmTEp4U9shWuxACwwAhy9qENTGTPvdsf3RqJ aZk90okGONYoK6Dof7/l9iWAX9zaHIanwewmOmx3VVEZ0p2mkqkJcwFjFjHnaLxNlONtnbpplg6 g57LNBRyAIrdz+SBsAyF0TaWOuoyU7eyZxyY1535oQLaTYONNXFWe+NCpprywrVA8zbMd8Y6Puh M= X-Received: by 2002:a17:907:6d06:b0:96f:9cea:a346 with SMTP id sa6-20020a1709076d0600b0096f9ceaa346mr991248ejc.1.1685010530799; Thu, 25 May 2023 03:28:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7+1BiVXLyl93V6BH0Q6MKdOnsBjC/4ByMkspveeB9uENyBQaTVtO86NT01b/gvnFVypNC3DA== X-Received: by 2002:a17:907:6d06:b0:96f:9cea:a346 with SMTP id sa6-20020a1709076d0600b0096f9ceaa346mr991235ejc.1.1685010530355; Thu, 25 May 2023 03:28:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, jsnow@redhat.com Subject: [PATCH 3/3] Makefile: remove $(TESTS_PYTHON) Date: Thu, 25 May 2023 12:28:44 +0200 Message-Id: <20230525102844.209240-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230525102844.209240-1-pbonzini@redhat.com> References: <20230525102844.209240-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1685010580747100005 Content-Type: text/plain; charset="utf-8" It is now the same as $(PYTHON), since the latter always points at pyvenv/b= in/python3. Signed-off-by: Paolo Bonzini Reviewed-by: Alex Benn=C3=A9e Reviewed-by: John Snow --- tests/Makefile.include | 8 +++----- tests/vm/Makefile.include | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 5b838ec438b0..0184ef223737 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -89,11 +89,9 @@ distclean-tcg: $(DISTCLEAN_TCG_TARGET_RULES) # Build up our target list from the filtered list of ninja targets TARGETS=3D$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targe= ts))) =20 -TESTS_VENV_DIR=3D$(BUILD_DIR)/pyvenv TESTS_VENV_TOKEN=3D$(BUILD_DIR)/pyvenv/tests.group TESTS_VENV_REQ=3D$(SRC_PATH)/tests/requirements.txt TESTS_RESULTS_DIR=3D$(BUILD_DIR)/tests/results -TESTS_PYTHON=3D$(TESTS_VENV_DIR)/bin/python3 ifndef AVOCADO_TESTS AVOCADO_TESTS=3Dtests/avocado endif @@ -109,7 +107,7 @@ else endif =20 quiet-venv-pip =3D $(quiet-@)$(call quiet-command-run, \ - $(TESTS_PYTHON) -m pip -q --disable-pip-version-check $1, \ + $(PYTHON) -m pip -q --disable-pip-version-check $1, \ "VENVPIP","$1") =20 $(TESTS_VENV_TOKEN): $(TESTS_VENV_REQ) @@ -131,7 +129,7 @@ FEDORA_31_DOWNLOAD=3D$(filter $(FEDORA_31_ARCHES),$(FED= ORA_31_ARCHES_CANDIDATES)) # download one specific Fedora 31 image get-vm-image-fedora-31-%: check-venv $(call quiet-command, \ - $(TESTS_PYTHON) -m avocado vmimage get \ + $(PYTHON) -m avocado vmimage get \ --distro=3Dfedora --distro-version=3D31 --arch=3D$*, \ "AVOCADO", "Downloading avocado tests VM image for $*") =20 @@ -142,7 +140,7 @@ JOBS_OPTION=3D$(lastword -j1 $(filter-out -j, $(filter = -j%,$(MAKEFLAGS)))) =20 check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images $(call quiet-command, \ - $(TESTS_PYTHON) -m avocado \ + $(PYTHON) -m avocado \ --show=3D$(AVOCADO_SHOW) run --job-results-dir=3D$(TESTS_RESUL= TS_DIR) \ $(if $(AVOCADO_TAGS),, \ --filter-by-tags-include-empty \ diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index c2a8ca1c175a..f0f5d32fb0f0 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -5,7 +5,7 @@ ifeq ($(realpath $(SRC_PATH)),$(realpath .)) VM_PYTHON =3D PYTHONPATH=3D$(SRC_PATH)/python /usr/bin/env python3 VM_VENV =3D else -VM_PYTHON =3D $(TESTS_PYTHON) +VM_PYTHON =3D $(PYTHON) VM_VENV =3D check-venv endif =20 --=20 2.40.1