From patchwork Mon Apr 3 13:49:17 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: 669769 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp1894376wrt; Mon, 3 Apr 2023 06:50:06 -0700 (PDT) X-Google-Smtp-Source: AKy350Y4cXo5+wboVdBE0iklxTktsc1K5s75BZp6aYucTtnuj850AYBKXdfbz6LuBq7qfngi2hVC X-Received: by 2002:ac8:5bd0:0:b0:3e4:e79c:55db with SMTP id b16-20020ac85bd0000000b003e4e79c55dbmr48810833qtb.42.1680529806758; Mon, 03 Apr 2023 06:50:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680529806; cv=none; d=google.com; s=arc-20160816; b=EuxltV4xfCjf4x+v1ymHMXXyTdaUWhcPIbYV51AaZVtQGzdih/cdgZz2oJtbwGh+By VQfKG9vJaxQOHQkE7ibsIIAkJp1umj0L9Tj+zm63L1h5JI1cvZw1L3qG8fVDPGKM7XQi HuMi9Pvrcn2lV3q9V1Uwchf0GTOaTe621kM8h3geuc/WYzl6XNb3NTxBdgSSSi3Dpj5y WJe19p3nBTaURiFB+meUZ/3Ed/1OHgL/ixz1sMnVOx19ehYxKsh2YTobE9X+5o0PdIcX TqHafNEfeuJ+pPvBpcGNwrLlBN2xNTjhn3UxIIVy/+dxxtq7MuiioijFD5A/oaQhK42e PAJw== 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=BNNm+hFhYmn6A4btsbTy8z3ys/wMqr7F5fsQ6UPTE0U=; b=EIPvVAOX26M1X0sSQmd0KeL6HDeEp789K6TxrArTwJPdTAuFBPiAuUe52tLtqoF7w4 z6aIaT2+K3gi6K0eIReS1c1Cj2DX6Qm8qxv3MaCV9tnLlqLQRjygqouWSjzTDnVlMB6V VqhZSxAR63FmfgnTfwUKd56bhlUn6Vs8KZh8T0jj965Z0Jhwm8Sv905sFSKWw+CGeIX4 QhqXj5Wdtf4dyDRlotR4ktjMnV6qWwoivTSwX6Jel2qfu7vtGWK3hRsqnVH8kDz3a82E dLHfPBDmniugm7MGD7XiFGoTSTsS14hF5s6qvVodF81Lmecf3ngHM2TFl5yuyEb+PWGf ImJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="uMZTW/+E"; 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 p142-20020a374294000000b00745bfe0f5a2si3646701qka.755.2023.04.03.06.50.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Apr 2023 06:50:06 -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="uMZTW/+E"; 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 1pjKYw-00032H-Rv; Mon, 03 Apr 2023 09:49:34 -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 1pjKYs-0002xX-Jm for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:30 -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 1pjKYo-0004vi-Av for qemu-devel@nongnu.org; Mon, 03 Apr 2023 09:49:30 -0400 Received: by mail-wm1-x332.google.com with SMTP id n10-20020a05600c4f8a00b003ee93d2c914so19552524wmq.2 for ; Mon, 03 Apr 2023 06:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680529765; 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=BNNm+hFhYmn6A4btsbTy8z3ys/wMqr7F5fsQ6UPTE0U=; b=uMZTW/+EF5o1W2A5JdfLs4oBqxYHeVBh65G8DF6NWJWPjReRFhKuCC/ncNpHwzh1qs mMEW2tZDNckEfFHS0GjWwR6IQexwG7ZXXRhicNL8f20z5m5Wdk3P5cQ8w/jkdpiCdqDL nLh92n6g0umdfLVI/eQbiF1cxRXgRItEeUiApK+mbKSMit9AUhnjl4hdTriQp+jk79nE 6tFc8cnDjdFMut0KwN1OCHIduIw+ynMVFPZ/mXSo/w5MIZx1TOwiMx0bB0B/C3Z3gm0j 6ePgrajdov1CzO49xyt1IvyKD+1XurKgKZaKP/PrY/1o3SOzUPkceYK5rLcstSpCjaYb OY9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680529765; 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=BNNm+hFhYmn6A4btsbTy8z3ys/wMqr7F5fsQ6UPTE0U=; b=PAgQW8SVBaO7qrjjQJiXbsV7dlV2FtGrDSZkTqf3EnGB05PBI6nP4CXj559X9oRPwl o5RP25Ex7eqMNO7qcCvsMgZuq/jS+fZlXqYIrUUVb1fme/UUn1I5tiSraHk8ySYM4UhA og/3EzTaghnKHH4tkfrWPognNYVo+CKVborXO0sN6kTcNSwtsu6PZqNl2bxFJUDuix3h bvxaxMf1CprMyCPdYUS+q04g8bJvXjC+K3oBfKujlIAw+uF0H/wpVtV0MP92GS6khpsG xJ/JIj0huP2lPMxQ1hYgUXgQoHZ/RHoDMoVCRKah+manRs93j7hVvsqd4E6eUR/qXJly E4bw== X-Gm-Message-State: AAQBX9dg5lOdP8L2Th+af3v6Jek8IQR77naTuOaBkIWs6XC8E5qXllZI LyDNmXim3AHQXEPe48afYDjSdg== X-Received: by 2002:a7b:c4c7:0:b0:3ef:6ae7:8994 with SMTP id g7-20020a7bc4c7000000b003ef6ae78994mr21868141wmk.22.1680529765031; Mon, 03 Apr 2023 06:49:25 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id r16-20020a05600c35d000b003ee9f396dcesm19503795wmq.30.2023.04.03.06.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Apr 2023 06:49:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7E9FF1FFB7; Mon, 3 Apr 2023 14:49:21 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Reinoud Zandijk , Ryo ONODERA , qemu-block@nongnu.org, Hanna Reitz , Warner Losh , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Kyle Evans , kvm@vger.kernel.org, Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Cleber Rosa , Thomas Huth , Kevin Wolf , =?utf-8?q?Da?= =?utf-8?q?niel_P=2E_Berrang=C3=A9?= Subject: [PATCH v2 08/11] tests/qemu-iotests: explicitly invoke 'check' via 'python' Date: Mon, 3 Apr 2023 14:49:17 +0100 Message-Id: <20230403134920.2132362-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230403134920.2132362-1-alex.bennee@linaro.org> References: <20230403134920.2132362-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 Message-Id: <20230330101141.30199-8-alex.bennee@linaro.org> --- 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,