From patchwork Tue Apr 4 14:59:22 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: 670042 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d08:0:0:0:0:0 with SMTP id z8csp2493587wrt; Tue, 4 Apr 2023 08:01:46 -0700 (PDT) X-Google-Smtp-Source: AKy350anLyx12V03NEFlTRhZcFYaXpSJt0LmWdNvw112n1GMGN5h3hz/XvYxLe9BGrlEadDFKllp X-Received: by 2002:a67:ea99:0:b0:426:b0e9:b5e4 with SMTP id f25-20020a67ea99000000b00426b0e9b5e4mr1308053vso.1.1680620505854; Tue, 04 Apr 2023 08:01:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680620505; cv=none; d=google.com; s=arc-20160816; b=vMcryC9E2gSeghk87kyPZFlqQu8cRwhWhVSlb0lQHp2aYgT9Kc/gZvWz/ZzJ39d0cS a2QOaHzinaVDc1A2SiFnFebE+nTHiz9ujC/qnMEp8VTOmKFAOpLZMjRUHMyj+8J0jrFR nwC/ZQlqOrWLC8XwVsjh0oaBogwUtRCdbgqkaVRzw9gMu7DJpsnadcUBFZbP56UfWt4v l8jjNE7YbVJ34O+Q2JcVpe4IPzZsZOfYzKY9J8ehSRRinegiIK3jAyhWVy6IRaRC2LyJ 6/vF4EH6iTzkKZxbnlCauC5qGLprOx0iY+o+Km35YOIhLTih03JScinqssEMOkwLqTVG O78A== 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=VLjuwoI0tklS2lCWxChUrAL9FHWkh8xZZV4DuqjaNu8=; b=EGhfXchzK7Oz6PPO5q4UG8WMq7uvJSwUl5mIvXSt6bULSDJbns/giRFEGL8w3sbsC7 sAz+6AbrEnDGj7afdAW2W04si5vFFSBiPDts4GcqS3IvbmZB/M1K/L7UIWEC/9+olPwZ zb695kkGQAdzMEibx4H0lsch9t8r43ANgYdxYtsWP+PkR0irsOywlxS3wdaHf+6/6xhr ngJDSjrYJg+fzgVXrI2zGOs2fQP47klEmhvzwYVFjHckOWK96moh+vHcqTosMBVmhq6g zS4u+BNZ2lbG2XxRw52JaY3tOfPDRcJDC7s4GfHuXA7+LLfBUST/Z1GHrFM+KRNsInIT VyWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lix3cDab; 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 s3-20020a056102300300b003aa18fc61f3si1923856vsa.1.2023.04.04.08.01.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 04 Apr 2023 08:01:45 -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=lix3cDab; 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 1pji8r-0004dW-6b; Tue, 04 Apr 2023 11:00:13 -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 1pji8K-0004Hb-Sb for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:40 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pji8E-0005CP-NY for qemu-devel@nongnu.org; Tue, 04 Apr 2023 10:59:39 -0400 Received: by mail-wr1-x430.google.com with SMTP id m2so33142157wrh.6 for ; Tue, 04 Apr 2023 07:59:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1680620369; 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=VLjuwoI0tklS2lCWxChUrAL9FHWkh8xZZV4DuqjaNu8=; b=lix3cDab6lA6a5zF/XVL/gEyA6yjcW8V29KxRtTplZ0Pfr/6E9jb66zb94lIUPEbOd wrP0TllA8lxVYTuvJd6FsDQSJu209dMmSEUdUn7Wp0QMw9eAVeyHyB8Qxb+ea8Q2604p oxpEd6Supc/kDgUVJq1MNH7F/MSXYdBP9hXTli1Ym9qFuVUv4iOMjCUIpTFfLSUdpoPf 6NMsTHSd8gi+RcJ3pNMV6f9ab5B2N9utsEd0/093S/h6rLPPSsEOc2q6swXLiHc8+Hty /3BMw+23FoXSR/z9sMwKV1G8oNg5GgAdrlPAbQCWDDGdnTcsdQrEvHUwhYP5Id5xEMf4 i6vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680620369; 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=VLjuwoI0tklS2lCWxChUrAL9FHWkh8xZZV4DuqjaNu8=; b=uW5mVhovV4yoIIK0a7ifkBntDe7tJY5crXl/E7PoB3z5EPbcxvJerKGfPCtt4nNe6R Ef8tMSaX0QQ9CHswMAQKMq+C6B9/YbILW1IdrfaylNTrRt7gK/CY1tG+iHNPXQOlhHhc Kp88CjcNpjO1a8EE3U7UGCJT+P8IR8EtSTL20BBkxyX8WYwfegLaubLWwlnTcP/Sq2pS lQRXKRsrZBLq+xE8QBqAPvN05JuPMy0EiyYnVmCFjVxvitut2vQLEC3Qpgmsc1515x3H hr3dSTbHBtgFbUbKFLAYN5qNt5nEXvrHrEPPtvOQtqdxmdMdPrvpB+fTnj5YZoUS5bSR 0+zA== X-Gm-Message-State: AAQBX9cxQER+QZ0A7R2XfjqOH/qtx1zkBHIQnZUi8STLz157d/UIJA8f ZDdrPcpPYiTX1pzZvgDrzeGqaA== X-Received: by 2002:a5d:5704:0:b0:2ce:a8e4:bb79 with SMTP id a4-20020a5d5704000000b002cea8e4bb79mr1882574wrv.53.1680620369265; Tue, 04 Apr 2023 07:59:29 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u18-20020a5d5152000000b002be5bdbe40csm12393408wrt.27.2023.04.04.07.59.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Apr 2023 07:59:27 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BECCE1FFBF; Tue, 4 Apr 2023 15:59:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Thomas Huth , Kevin Wolf , Hanna Reitz , qemu-block@nongnu.org (open list:Block layer core) Subject: [PULL 07/10] tests/qemu-iotests: explicitly invoke 'check' via 'python' Date: Tue, 4 Apr 2023 15:59:22 +0100 Message-Id: <20230404145925.2638152-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230404145925.2638152-1-alex.bennee@linaro.org> References: <20230404145925.2638152-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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=unavailable 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: <20230403134920.2132362-9-alex.bennee@linaro.org> 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,