From patchwork Thu Mar 30 10:11:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 668592 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp845759wrt; Thu, 30 Mar 2023 03:12:19 -0700 (PDT) X-Google-Smtp-Source: AKy350blxZePD1mjUmVQk5n2+OSSF99KQ5g4Tz7B54l2TvnCvAe0nDoSBp76S0sR8iqFlWjckLJN X-Received: by 2002:a05:6214:f22:b0:5df:5167:c420 with SMTP id iw2-20020a0562140f2200b005df5167c420mr9616564qvb.38.1680171138869; Thu, 30 Mar 2023 03:12:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680171138; cv=none; d=google.com; s=arc-20160816; b=e+P03Z027vUQdQ2UIhZ7guXMFNqvc0bPBQlutQlfjFzziuxFRHx+flwwIFpzoiO311 oi9gcc1kPkZKIfu2ylRcEpWIVv9fkw+OhWWQzqcqEfghCrpwlnI9QqqtoDYPJB0PhJ5y X/qqzzLyH3SYnX37VtP3Ja3rXXsj4xcWB7nwhdjddqqGqWY2LDTMPVOV75dHRXGV85uy K8YlUSDE3AtSG8/0H3sULQHDt22yT1YKXQqFHNPnGFkxjBcv4+wMRNn1FpTviwdY92wF CUdqAPHKiLZNJwUklk1wgiH2bHsQ3PJYJ0l13opfCkdPuY1wurP8W+HXwApqNIC/wAQB HUnw== 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:dkim-signature; bh=xJESc3vRxMeUkJokIIbDRbo6dBnH1WDID4CWuuBjrPc=; b=JXherUEU2s7raDoEKkjlk4h9Zbn9zwt2mgQdqrdUzWSnVmnUIi4HVD1yfimI3I3Gj9 KaTzi92e64HqT+Ap93IaJrEpZWPXcSNw9xCZYR7ag0C0d6gPsCOLU3tDK44wR5iJi+QU Zs+FmDWIqL4rLbxHqyDD41OYivPg/E+nwX4tI/VqwVqyTkg8Rx5RK1qWLGMkDGyiRGcs fMqsDUKg0QAWZPRZOOwvrRz3cYqN2utQkugosCz3yFADbcjpSF9A/XXlPg4z2Jdm5Iqj xvED5flAEsxpwxy2zenScGKxgLhiRLtGyb4Mq1k+HNUWRLvcdOwWHktT+aC5XgDGdsWw gAYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=y4WJhZMe; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d129-20020a376887000000b00748492ce727si11388049qkc.418.2023.03.30.03.12.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Mar 2023 03:12:18 -0700 (PDT) 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; dkim=pass header.i=@linaro.org header.s=google header.b=y4WJhZMe; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1phpG8-0007Yv-QF; Thu, 30 Mar 2023 06:11: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 1phpG6-0007W7-4T for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:54 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1phpG0-0000ID-1d for qemu-devel@nongnu.org; Thu, 30 Mar 2023 06:11:52 -0400 Received: by mail-wm1-x332.google.com with SMTP id v20-20020a05600c471400b003ed8826253aso3172141wmo.0 for ; Thu, 30 Mar 2023 03:11:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680171106; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xJESc3vRxMeUkJokIIbDRbo6dBnH1WDID4CWuuBjrPc=; b=y4WJhZMeMc8S6zRFYuAO1yg8qQeNukRifQTeynVVGg33Q86rPnl+9tQ0nUXUhrq8TX c3bihTW0U61yPcRdTTvZ3PQPoH85s5Y01Po0lnO6diiM2SuCwK0XqgYN2wvsmPh5kHKL qY/PLb5hAo4eS1PqsjNXJwcuG2M7zqCCmLzxx+sRt8yclcu4owjiIAQG4zuvBkPBdYNA lAvzwlGTDe93x+WQL71uFrvrTLWZgVA2WSmWfbHqmOM65oBNHNLCgeo+0SKwcKC8RZpI ntaEMUSCIMdbhSIdZ4p44cUu3KyHphsa4tcSuT9InGiNyUzEM1U/cWJ74LusLMWIiSIf n6Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680171106; 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=xJESc3vRxMeUkJokIIbDRbo6dBnH1WDID4CWuuBjrPc=; b=oWK5Ayg7LGjq+Qjpi3ADMy8bbFcNNUeiYTivOe0VpAqnzEase62uhSnBBRThnaXLgc Hq7kkA4HEJWPu556Sxf9/ThHkk5V7d5fbhNPsaEBwAXjBG2CCzzdpm9mmBrdclVRgHo6 fhsPpZYRgLuLu1SrU/JOScZ4dI4YK1D9vII2M5pGl7o097lnnKpGzmRce0YZbeaCW1LE eoWE7hgn+XHsIvntGwr9EAx5tw8z501hp89cTf9A0jtAp8TZ9fb3+VEizHKsLXgnHKJv nqhoWAJCU2lHMoYOVzWQaoTy6tGlhPS70R5sMP6Yz0foxM3Fb4iyo8tiHqLJFPQVZUVQ 4R2w== X-Gm-Message-State: AO0yUKVQRzO3E2r53/vz7lkveBRRWuFLmyfpA6eaxbZHQdpX/EH1Td3D 2wIryqDJwfLCDWGY4UVZu6RyiQ== X-Received: by 2002:a1c:790b:0:b0:3ee:7022:5eda with SMTP id l11-20020a1c790b000000b003ee70225edamr17455877wme.7.1680171106468; Thu, 30 Mar 2023 03:11:46 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m16-20020a7bca50000000b003ee10fb56ebsm5370560wml.9.2023.03.30.03.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 03:11:44 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C33BF1FFBF; Thu, 30 Mar 2023 11:11:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , Warner Losh , Ryo ONODERA , Kevin Wolf , Beraldo Leal , Wainer dos Santos Moschetta , Hanna Reitz , qemu-block@nongnu.org, =?utf-8?q?Philippe_?= =?utf-8?q?Mathieu-Daud=C3=A9?= , Kyle Evans , Reinoud Zandijk , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini Subject: [PATCH 07/11] tests/qemu-iotests: explicitly invoke 'check' via 'python' Date: Thu, 30 Mar 2023 11:11:37 +0100 Message-Id: <20230330101141.30199-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230330101141.30199-1-alex.bennee@linaro.org> References: <20230330101141.30199-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.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, 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 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: Daniel P. Berrangé The 'check' script will use "#!/usr/bin/env python3" by default to locate python, but this doesn't work in distros which lack a bare 'python3' binary like NetBSD. We need to explicitly invoke 'check' by referring to the 'python' variable in meson, which resolves to the detected python binary that QEMU intends to use. This fixes a regression introduced by commit 51ab5f8bd795d8980351f8531e54995ff9e6d163 Author: Daniel P. Berrangé Date: Wed Mar 15 17:43:23 2023 +0000 iotests: register each I/O test separately with meson Signed-off-by: Daniel P. Berrangé Reviewed-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230329124539.822022-1-berrange@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/qemu-iotests/meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index a162f683ef..9735071a29 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -47,19 +47,20 @@ foreach format, speed: qemu_iotests_formats endif rc = run_command( - [qemu_iotests_check_cmd] + args + ['-n'], + [python, qemu_iotests_check_cmd] + args + ['-n'], check: true, ) foreach item: rc.stdout().strip().split() - args = ['-tap', '-' + format, item, + args = [qemu_iotests_check_cmd, + '-tap', '-' + format, item, '--source-dir', meson.current_source_dir(), '--build-dir', meson.current_build_dir()] # Some individual tests take as long as 45 seconds # Bump the timeout to 3 minutes for some headroom # on slow machines to minimize spurious failures test('io-' + format + '-' + item, - qemu_iotests_check_cmd, + python, args: args, depends: qemu_iotests_binaries, env: qemu_iotests_env,