From nobody Mon Feb 9 04:46:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1644317490975684.0462814409635; Tue, 8 Feb 2022 02:51:30 -0800 (PST) Received: from localhost ([::1]:39110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHO5q-0002hu-BN for importer@patchew.org; Tue, 08 Feb 2022 05:51:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHNVB-0006hN-57 for qemu-devel@nongnu.org; Tue, 08 Feb 2022 05:13:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:35237) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHNV9-0003Y4-Er for qemu-devel@nongnu.org; Tue, 08 Feb 2022 05:13:36 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-531--v8wMULdMEqPnNNKk97WAw-1; Tue, 08 Feb 2022 05:13:29 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A55216127C; Tue, 8 Feb 2022 10:13:28 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.143]) by smtp.corp.redhat.com (Postfix) with ESMTP id 123D82856D; Tue, 8 Feb 2022 10:13:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644315212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JaHUvzjFbj1WpZOCy8SCdLGzCdMLYST/KTk2UyzmokA=; b=W/HdC+Qld54k2ACxKOVinX8qOBwqBFpdp2HtsbwR3GN+YIaCxjjWDzPNi626VBOAQg1dOR zwfAvr9mKQoNcypCyKnO2hf1xjmmgyN/2tWFQAb5nKCsfL2hlQx67+wJHPFQGlvb7h+Hd+ DiOkcn4PKiQztyeE8Wugwj6b9cMwtKo= X-MC-Unique: -v8wMULdMEqPnNNKk97WAw-1 From: Thomas Huth To: qemu-block@nongnu.org, Hanna Reitz , Kevin Wolf Subject: [PATCH 6/6] tests: Remove check-block.sh Date: Tue, 8 Feb 2022 11:13:11 +0100 Message-Id: <20220208101311.1511083-7-thuth@redhat.com> In-Reply-To: <20220208101311.1511083-1-thuth@redhat.com> References: <20220208101311.1511083-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Paolo Bonzini , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1644317492953100003 Content-Type: text/plain; charset="utf-8" Now that the iotests are added by the meson.build file already, we do not need the check-block.sh wrapper script anymore. Signed-off-by: Thomas Huth --- tests/check-block.sh | 73 -------------------------------------------- 1 file changed, 73 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 af0c574812..0000000000 --- a/tests/check-block.sh +++ /dev/null @@ -1,73 +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=3D"$@" -if [ "$SPEED" =3D "slow" ] || [ "$SPEED" =3D "thorough" ]; then - group=3D -else - group=3D"-g auto" -fi - -skip() { - echo "1..0 #SKIP $*" - exit 0 -} - -if grep -q "CONFIG_GPROF=3Dy" config-host.mak 2>/dev/null ; then - skip "GPROF is enabled =3D=3D> Not running the qemu-iotests." -fi - -# Disable tests with any sanitizer except for specific ones -SANITIZE_FLAGS=3D$( grep "CFLAGS.*-fsanitize" config-host.mak 2>/dev/null ) -ALLOWED_SANITIZE_FLAGS=3D"safe-stack cfi-icall" -#Remove all occurrencies of allowed Sanitize flags -for j in ${ALLOWED_SANITIZE_FLAGS}; do - TMP_FLAGS=3D${SANITIZE_FLAGS} - SANITIZE_FLAGS=3D"" - for i in ${TMP_FLAGS}; do - if ! echo ${i} | grep -q "${j}" 2>/dev/null; then - SANITIZE_FLAGS=3D"${SANITIZE_FLAGS} ${i}" - fi - done -done -if echo ${SANITIZE_FLAGS} | grep -q "\-fsanitize" 2>/dev/null; then - # Have a sanitize flag that is not allowed, stop - skip "Sanitizers are enabled =3D=3D> Not running the qemu-iotests." -fi - -if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then - skip "No qemu-system binary available =3D=3D> Not running the qemu-iot= ests." -fi - -if ! command -v bash >/dev/null 2>&1 ; then - skip "bash not available =3D=3D> Not running the qemu-iotests." -fi - -if LANG=3DC bash --version | grep -q 'GNU bash, version [123]' ; then - skip "bash version too old =3D=3D> 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=3D1 -export PYTHONUTF8=3D1 -# If make was called with -jN we want to call ./check with -j N. Extract t= he -# 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 va= lue: -# "-j N" -# Note, that the following works even if make was called with "-j N" or ev= en -# "--jobs N", as all these variants becomes simply "-jN" in MAKEFLAGS vari= able. -JOBS=3D$(echo "$MAKEFLAGS" | sed -n 's/\(^\|.* \)-j\([0-9]\+\)\( .*\|$\)/-= j \2/p') - -ret=3D0 -for fmt in $format_list ; do - ${PYTHON} ./check $JOBS -tap -$fmt $group || ret=3D1 -done - -exit $ret --=20 2.27.0