From patchwork Wed Feb 28 22:54:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 776500 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp538029wrn; Wed, 28 Feb 2024 14:57:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUyk8oMeWtJyu9/CWGJU7DDK5MhANQYj2pGnMHEWLVpaXxrDXeG2k7ugZKU9DboqYzJfYBqDv8Dso01Uv+pO7ek X-Google-Smtp-Source: AGHT+IFQ/TWI5lb9pDpKnGldmjfxH5TyF3N4pm0oaLlbE3j3VwKKr9vFeHxjjBJKTGSa+c3vpmGy X-Received: by 2002:a05:620a:6230:b0:787:c8fd:3646 with SMTP id ou48-20020a05620a623000b00787c8fd3646mr470261qkn.31.1709161062077; Wed, 28 Feb 2024 14:57:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709161062; cv=none; d=google.com; s=arc-20160816; b=epJAeUh1CDhTyEPPRScxLnIac6GOAg1sFFTbkykyLX3VQLfDNhqkz5ZRAWcT/KiX1H 2+7i/W6IoLndldEKRSgNzdyio9EOcZNvtDdfzcgYy6uTbxx807et373jsVvG1AAiqbuj LnkEnN6+aI+/vb5KAY63tSsiN1pp/9Q2cdKylOBZ1EZyZrJJ4qvNipYkFvq6o7hGsUhK dbUwFSMQcJ/Y0/3Qb2GNAOYGiGRy/08t4eR1I3Y1WPyHw57R6OBixp1l8d1LPXhWC2cl DZAgOsmrNde0v2dj235JCAKO8dbUBF4V1FAQ8RGw+kKKzndfHpz8kmgCll3WHb3MhdQ2 vqaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=wGnZM3q+9N0zIOG/ysNWm82VADveP+9KarzpXaZYDE8=; fh=FHMsADLlRMWW9R6yP2bGF48ZObJtNksnF1ZnDLXDa4I=; b=dybcYH3hzMIyeTwtQNsSardTDCNaTndId6PRr/ODo5FFSMHwFEmyfQi+f1SgobmR28 ygB1w+SN4a/5jP71TfQ8K1F4zjouMjvAUbEkqR9HzF1/MIe7MMLDfyVOir6vQ/+Nxwsd QRI5YzDRQqVOwUx2jxEhGWh8wLrxvsyTxub7l08anEiR9sClevjMgKuT6S4PjqTn7w3p O75QrFpRIx2cNEDyyFcgwYm/KZ/n4U3H5rA6APCVWxAgeu4iUjtfMxx3MtbO5cX2YR2y bqOeXXYlg5bA6gQSnHBvLSmk+SSamtlSd7axA9Py2ZmxNSISmYRnLcaZ9O74hGoyCvuu W3vg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o17-20020a05620a22d100b00787ec0da457si160218qki.269.2024.02.28.14.57.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Feb 2024 14:57:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfSqc-0006IA-TS; Wed, 28 Feb 2024 17:56:22 -0500 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 1rfSqa-0006H6-RT; Wed, 28 Feb 2024 17:56:20 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfSqY-0000qR-3c; Wed, 28 Feb 2024 17:56:20 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 8181351816; Thu, 29 Feb 2024 01:55:33 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id E57FC8BB49; Thu, 29 Feb 2024 01:54:56 +0300 (MSK) Received: (nullmailer pid 274165 invoked by uid 1000); Wed, 28 Feb 2024 22:54:55 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Michael Tokarev Subject: [Stable-8.2.2 77/78] tests/vm: avoid re-building the VM images all the time Date: Thu, 29 Feb 2024 01:54:53 +0300 Message-Id: <20240228225455.274062-17-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Alex Bennée The main problem is that "check-venv" is a .PHONY target will always evaluate and trigger a full re-build of the VM images. While its tempting to drop it from the dependencies that does introduce a breakage on freshly configured builds. Fortunately we do have the otherwise redundant --force flag for the script which up until now was always on. If we make the usage of --force conditional on dependencies other than check-venv triggering the update we can avoid the costly rebuild and still run cleanly on a fresh checkout. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2118 Reviewed-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20240227144335.1196131-4-alex.bennee@linaro.org> (cherry picked from commit 151b7dba391fab64cc008a1fdba6ddcf6f8c39c8) Signed-off-by: Michael Tokarev diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index bf12e0fa3c..ac56824a87 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -102,7 +102,7 @@ $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \ $(if $(LOG_CONSOLE),--log-console) \ --source-path $(SRC_PATH) \ --image "$@" \ - --force \ + $(if $(filter-out check-venv, $?), --force) \ --build-image $@, \ " VM-IMAGE $*") diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 61725b8325..e38159a6fd 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -644,9 +644,9 @@ def main(vmcls, config=None): vm = vmcls(args, config=config) if args.build_image: if os.path.exists(args.image) and not args.force: - sys.stderr.writelines(["Image file exists: %s\n" % args.image, + sys.stderr.writelines(["Image file exists, skipping build: %s\n" % args.image, "Use --force option to overwrite\n"]) - return 1 + return 0 return vm.build_image(args.image) if args.build_qemu: vm.add_source_dir(args.build_qemu)