From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7FD9BC77B7A for ; Thu, 25 May 2023 14:24:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q2Bkx-0004aj-Mx; Thu, 25 May 2023 10:15: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 1q2Bkr-0004WU-97 for qemu-devel@nongnu.org; Thu, 25 May 2023 10:15:51 -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 1q2Bkp-0007Yl-Mu for qemu-devel@nongnu.org; Thu, 25 May 2023 10:15:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685024147; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fzs0h2LMkCyS2RcHmjcBAfl2R0ztIYcRkkcOdDDYgWk=; b=HurCLQw0hU1NMwAr91tL1RnVM4qhTvQOK1jSCveykKeFtE3zNY69vBQsQIuzYQjY1FxxUW Mx76c4uv4h29SiOE31443Wt7zI+UBYtg8kczMSVjsk+bo7lsuhQNKWkUsLtKMzY6A+voFb y7ZNOeUDwj6nqSB8F17bhFt7cHbxlPM= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-502-tVHd1N4oPnKWi8oSrI6yIg-1; Thu, 25 May 2023 10:15:45 -0400 X-MC-Unique: tVHd1N4oPnKWi8oSrI6yIg-1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-510d8e4416cso2868218a12.3 for ; Thu, 25 May 2023 07:15:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685024144; x=1687616144; 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=Fzs0h2LMkCyS2RcHmjcBAfl2R0ztIYcRkkcOdDDYgWk=; b=AAFs2Bqr/p/p96+fABhDuzxhD1ScD8zBeJ0YNHHj07kLtvtIHG29xC2b/DNp6wMFsk Q5ViOq/HtD31dKCSigaXAf6kMzKa2ehWvb27SbqR0uPs1dqCXH59nmCZoWzIyiF8GITl 2BzvcnZBMb9c5wCzdr4GpDSrqbiLoI46WaKmqusGlZxSWhbgvJKiU86yko42e3mfS80+ j9CjIEpxBOvPYVVqsZM3aJFvIOzc13px3LK5aAjMXwqA5//UIhEBVmzTYyCAwivqJjVr ckWLLYijObgu/4l5DMgXs6sjLBBlrbRmW2dy4jtUtcTUD9962H0c0qqluq5tuZewh/0o QqCQ== X-Gm-Message-State: AC+VfDziCLupGYbai3io5zDgB834IaEcHbpXVPNuURQ5WgrcDGmTHILV AnR6XHa0rE6dkOcUzaVAzldjuOSxXhV2/GUMLvtXTKeSJ22vItYu0cYWMDV/PCYEIvwmRal9rV3 /+OBA9x08tr/CalQomSyOqd33Fh1ZM1mJ3kFbrRAd0maQGWj/xVeR8yI+WXQMZTFz2b3rJvFkp7 8= X-Received: by 2002:a17:907:6d94:b0:96f:bab6:4db5 with SMTP id sb20-20020a1709076d9400b0096fbab64db5mr1741731ejc.28.1685024143947; Thu, 25 May 2023 07:15:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6yb+yMvoihMNSulHTm8GWjfey/Lr0T32EJfSwRZS/kc8ltDAkiliLvZ/y4gTm4uBLqnQfhWA== X-Received: by 2002:a17:907:6d94:b0:96f:bab6:4db5 with SMTP id sb20-20020a1709076d9400b0096fbab64db5mr1741707ejc.28.1685024143636; Thu, 25 May 2023 07:15:43 -0700 (PDT) Received: from [192.168.10.117] ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id bq13-20020a170906d0cd00b00965c6c63ea3sm903763ejb.35.2023.05.25.07.15.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 May 2023 07:15:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PULL 07/20] Makefile: remove $(TESTS_PYTHON) Date: Thu, 25 May 2023 16:15:19 +0200 Message-Id: <20230525141532.295817-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230525141532.295817-1-pbonzini@redhat.com> References: <20230525141532.295817-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org It is now the same as $(PYTHON), since the latter always points at pyvenv/bin/python3. Reviewed-by: Alex Bennée Signed-off-by: Paolo Bonzini --- 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=$(patsubst libqemu-%.fa, %, $(filter libqemu-%.fa, $(ninja-targets))) -TESTS_VENV_DIR=$(BUILD_DIR)/pyvenv TESTS_VENV_TOKEN=$(BUILD_DIR)/pyvenv/tests.group TESTS_VENV_REQ=$(SRC_PATH)/tests/requirements.txt TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results -TESTS_PYTHON=$(TESTS_VENV_DIR)/bin/python3 ifndef AVOCADO_TESTS AVOCADO_TESTS=tests/avocado endif @@ -109,7 +107,7 @@ else endif quiet-venv-pip = $(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") $(TESTS_VENV_TOKEN): $(TESTS_VENV_REQ) @@ -131,7 +129,7 @@ FEDORA_31_DOWNLOAD=$(filter $(FEDORA_31_ARCHES),$(FEDORA_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=fedora --distro-version=31 --arch=$*, \ "AVOCADO", "Downloading avocado tests VM image for $*") @@ -142,7 +140,7 @@ JOBS_OPTION=$(lastword -j1 $(filter-out -j, $(filter -j%,$(MAKEFLAGS)))) check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images $(call quiet-command, \ - $(TESTS_PYTHON) -m avocado \ + $(PYTHON) -m avocado \ --show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_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 = PYTHONPATH=$(SRC_PATH)/python /usr/bin/env python3 VM_VENV = else -VM_PYTHON = $(TESTS_PYTHON) +VM_PYTHON = $(PYTHON) VM_VENV = check-venv endif -- 2.40.1