From patchwork Wed Mar 15 17:43:24 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: 663393 Delivered-To: patch@linaro.org Received: by 2002:a5d:5602:0:0:0:0:0 with SMTP id l2csp1720373wrv; Wed, 15 Mar 2023 11:00:39 -0700 (PDT) X-Google-Smtp-Source: AK7set93kWJ9dh9D0vrr0Bj8xO7Sje3X2KpFnt7+Ycq6arWZ5OBA4OzdVI1kD/IiY+MJpEDZG6QH X-Received: by 2002:a05:6214:5284:b0:5ab:af50:eb36 with SMTP id kj4-20020a056214528400b005abaf50eb36mr13464565qvb.45.1678903238936; Wed, 15 Mar 2023 11:00:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678903238; cv=none; d=google.com; s=arc-20160816; b=wXek2iBZgx05whDojUnx3tn8rX1zqyBlNER3bdsmvQi9Kj0nz9MY91At71xdlRbkAa +Nis44MpZd1fm0z0puf8cQBNSzd+yVrRG0YEVeyILyOmVeSockZPcYEi8vF3yzt2xgUq MXVk0eSxFKjFsfiIdxBLn4YiklQPk1r5U6v5NvVNk+b0yc001jxN5Y1rhx3XfxxTMpqh FRxgvKstE23/IAlx6wcExqoNdZatilTPs8oMhFVNHmbp6iu4f/p0CrIeeNPGB4SFZ1W7 HCmJ0d8njFDVu3lDoYb7SNsa6OHoVNqD21EzmNg2Ucc2nVaJXsRVTrOYG2y/7LFHtkOv nKcA== 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=UdK4L7buRJRBhWENt6vEwjRP9U71/totQZg0N/PH0dY=; b=syA5IZtxzIZJOYNoGAg9I7hz04LHxpmCIJkW4vDj3WPk7N+YLHlCahvTnYfOgkt+aQ 2VIuWXBRAOKADJ0IpEDPyriNaNZ+3wqEmpxisGpIDoG1YqJrQw90G6LQpCAZS2N2KtxE UJwSOrdDcnbP47WhCRuXScZRT4e1gl77MXFVoaUfwpOuUQr7bFemWIQYtqlK1s9lujaw QjhvFIP8DWk6Len/SeO6WMwk8Oi8EaYaenjce8LRhV1zQw+jcFfwANnH+K7CvEAOYvJx 0dWs6YZE+ncQfYf70Yym0Zkj4762+o0i1lLCNkfVCJi8dgAF4CwMshajXYQA+KgBl3rm pjBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WfOmM7Pm; 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 fv11-20020a056214240b00b005b267f1037csi831150qvb.581.2023.03.15.11.00.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Mar 2023 11:00:38 -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=WfOmM7Pm; 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 1pcVPK-0005mH-4o; Wed, 15 Mar 2023 13:59:26 -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 1pcVPI-0005lt-Hu for qemu-devel@nongnu.org; Wed, 15 Mar 2023 13:59:24 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pcVPG-0004B5-Aa for qemu-devel@nongnu.org; Wed, 15 Mar 2023 13:59:23 -0400 Received: by mail-wm1-x331.google.com with SMTP id c8-20020a05600c0ac800b003ed2f97a63eso1600411wmr.3 for ; Wed, 15 Mar 2023 10:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678903160; 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=UdK4L7buRJRBhWENt6vEwjRP9U71/totQZg0N/PH0dY=; b=WfOmM7Pmqts8fO7pZEN4UjzlRO6WiUa6G4uOEWiBLr8cfUVMXdV80VYlYbohHUPOAB CdkeXPU0/cAeYi0S8fLOeCtDY68+LpcAYRA3Cggm6798NgIBjmxQQrPdf5wLV5v2oxZo S3TLlhCvGmC6K0kZM5X9DgypJ8EwgBciy69riFL4SZ2zHvY4guRshb0x5EAdHfonyUpp b/VrsSJ3ZPxtIlTvD1ejvzCjej/h0y6Xz/2TtkkrqHo5NcL62/P8nJBmhAb1LmCej27o Pzp9ePLOiRX+cTDne9OjTkN767wM3QBkQQvM+CJU7KUJ4mQVOycniOj36vtEB7bD+7CW ZQew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678903160; 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=UdK4L7buRJRBhWENt6vEwjRP9U71/totQZg0N/PH0dY=; b=liacEEnsDIqVHu7jo8rAoyhKvbyDSQO0P6jZ08ieoRy77iLX85KhL44BPdYoirey8m kSIPg6U9kb5W1pwPV7sH/MoB1ThK/X8E4m5I/xJkfYmI7krsWfo1Hdu3V2vzTDyE+hFt 9phX4xXxuySw4OcSp1ngk60oD/oKuHBE5b/Wx6GFNqK60e75wZEBw5tadvxnO36JsmOn cjuP/PeCOmznDyJAq1Ot0ZVU6QhSdbSXyO81VSmHXbSZ3Qo29DL/kGznf8mIChzLbxWe N6ptEDwNAEu+Sflh308+9eK0CQtAy89sDgZJe8foR23/XyNFCZ/iTTxz3wWkWCp5wEeJ uVUw== X-Gm-Message-State: AO0yUKWocLi0eHgMSt2qgkLMLt9NOUCmMhidzArB0CxhDlEJc5pHTcZM 2EKPwMTnOuq+ziQkhgjqZbK2GA== X-Received: by 2002:a05:600c:450d:b0:3ed:314a:326c with SMTP id t13-20020a05600c450d00b003ed314a326cmr3501284wmo.11.1678903160398; Wed, 15 Mar 2023 10:59:20 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l26-20020a05600c2cda00b003dd1bd0b915sm2704802wmc.22.2023.03.15.10.59.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 10:59:20 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7E9E11FFD0; Wed, 15 Mar 2023 17:43:44 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , =?utf-8?q?Marc-Andr=C3=A9_Lurea?= =?utf-8?q?u?= , qemu-riscv@nongnu.org, Riku Voipio , Igor Mammedov , Xiao Guangrong , Thomas Huth , Wainer dos Santos Moschetta , "Dr. David Alan Gilbert" , Alex Williamson , Hao Wu , Cleber Rosa , Daniel Henrique Barboza , Jan Kiszka , Aurelien Jarno , qemu-arm@nongnu.org, Marcelo Tosatti , Eduardo Habkost , Alexandre Iooss , Gerd Hoffmann , Palmer Dabbelt , Ilya Leoshkevich , qemu-ppc@nongnu.org, Juan Quintela , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Darren Kenny , kvm@vger.kernel.org, Marcel Apfelbaum , Peter Maydell , Richard Henderson , Stafford Horne , Weiwei Li , Sunil V L , Stefan Hajnoczi , Thomas Huth , Vijai Kumar K , Liu Zhiwei , David Gibson , Song Gao , Paolo Bonzini , "Michael S. Tsirkin" , Niek Linnenbank , Greg Kurz , Laurent Vivier , Qiuhao Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Xiaojuan Yang , Mahmoud Mandour , Alexander Bulekov , Jiaxun Yang , qemu-block@nongnu.org, Yanan Wang , David Woodhouse , qemu-s390x@nongnu.org, Strahinja Jankovic , Bandan Das , Alistair Francis , Aleksandar Rikalo , Tyrone Ting , Kevin Wolf , David Hildenbrand , Beraldo Leal , Beniamino Galvani , Paul Durrant , Bin Meng , Sunil Muthuswamy , Hanna Reitz , Peter Xu , =?utf-8?q?Al?= =?utf-8?q?ex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P=2E_?= =?utf-8?q?Berrang=C3=A9?= Subject: [PATCH v2 25/32] iotests: remove the check-block.sh script Date: Wed, 15 Mar 2023 17:43:24 +0000 Message-Id: <20230315174331.2959-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315174331.2959-1-alex.bennee@linaro.org> References: <20230315174331.2959-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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é Now that meson directly invokes the individual I/O tests, the check-block.sh wrapper script is no longer required. Signed-off-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Acked-by: Hanna Czenczek Tested-by: Thomas Huth Message-Id: <20230303160727.3977246-9-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/check-block.sh | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100755 tests/check-block.sh diff --git a/tests/check-block.sh b/tests/check-block.sh deleted file mode 100755 index 5de2c1ba0b..0000000000 --- a/tests/check-block.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -if [ "$#" -eq 0 ]; then - echo "Usage: $0 fmt..." >&2 - exit 99 -fi - -# Honor the SPEED environment variable, just like we do it for "meson test" -format_list="$@" -if [ "$SPEED" = "slow" ] || [ "$SPEED" = "thorough" ]; then - group= -else - group="-g auto" -fi - -skip() { - echo "1..0 #SKIP $*" - exit 0 -} - -if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then - skip "No qemu-system binary available ==> Not running the qemu-iotests." -fi - -cd tests/qemu-iotests - -# QEMU_CHECK_BLOCK_AUTO is used to disable some unstable sub-tests -export QEMU_CHECK_BLOCK_AUTO=1 -export PYTHONUTF8=1 -# If make was called with -jN we want to call ./check with -j N. Extract the -# flag from MAKEFLAGS, so that if it absent (or MAKEFLAGS is not defined), JOBS -# would be an empty line otherwise JOBS is prepared string of flag with value: -# "-j N" -# Note, that the following works even if make was called with "-j N" or even -# "--jobs N", as all these variants becomes simply "-jN" in MAKEFLAGS variable. -JOBS=$(echo "$MAKEFLAGS" | sed -n 's/\(^\|.* \)-j\([0-9]\+\)\( .*\|$\)/-j \2/p') - -ret=0 -for fmt in $format_list ; do - ${PYTHON} ./check $JOBS -tap -$fmt $group || ret=1 -done - -exit $ret