From patchwork Tue Jul 23 10:36:09 2019 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: 169508 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp8707837ilk; Tue, 23 Jul 2019 03:42:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqwp81YPoZDsq5RzCHSu1bl3+T9kf78TTFdMlw9XwULV5Zq3fdIMQ+anpOL4aHBsKy2+3Ttq X-Received: by 2002:ac8:2a0a:: with SMTP id k10mr55012572qtk.148.1563878534894; Tue, 23 Jul 2019 03:42:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563878534; cv=none; d=google.com; s=arc-20160816; b=rSRuU7zq1q5L+J6ii+gHgpIw0C1hDCW0xfG8MGAB9IIrBpQgEwodyHncWBy2WEZEY0 DqeYvF0i8rHrr7NgkglRG1EgZEjbx/MrvLkKGy7meZFTgoWozXPDCB4BC+y8/shyJyFX gStn7iGAR0t0jdTSctZ6WgMSoZoPIhn3QeCsAf0d1BA87ESRnNZCwZo7EMh3QuHVH7rq 0dfu3tMwu9tqloYEvcmqI+f/WuHrCtWdc+cE3Sho+JlBYlzrQsZuuw23a681pYW2STqG cAwadf7+bapzY0qWgBuv9EMR4Fkh6PpQorx3hdi/KMw/wZ8PVb4Y+catU8h7Jza9adkt wCLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=UnzyRxO8LdQ2pkjo8SoYMr5p6k7VTvscFEOudhhqpPw=; b=E71V0lJJug0VEdYBBBgdmqacDaVC1kLmTKyfu9gM6CA8HKkJEnAymh0ZxyJjtEUQN1 R5q4ZysPjdhTSsB6ZFje8UwXZY/5UPh0NRXZHIps/4b673hA8dvcoNpXCZvKIb5AXf6h hYns5HNHrCs1Mbut22zAMQmAjSUAoZnlrN9nqi87rYfO8uyf3U57BNPAYncwj0CwXzVo tx2R1IgCFiC9sIVhqI3Md9sco6nUx/tXorlYiaJ3uADpgZ19rBGzZ0TO1gfCE6OSligA o1KiciWS9qBMP6m8Y1BkyvOKSdmzUg+UOVJ8vq+hIbYEqQo5TjhHsSYxZ7D+eWyHQcwf qB2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=wRylIbBK; 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=fail (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 l4si28530374qtk.337.2019.07.23.03.42.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 03:42:14 -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=fail header.i=@linaro.org header.s=google header.b=wRylIbBK; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsFJ-0003BA-Nt for patch@linaro.org; Tue, 23 Jul 2019 06:42:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39767) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsFA-0002rp-5q for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsF8-0004No-Bq for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:04 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:35141) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hpsF8-0004Bs-0C for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:42:02 -0400 Received: by mail-wr1-x42d.google.com with SMTP id y4so42643517wrm.2 for ; Tue, 23 Jul 2019 03:41:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UnzyRxO8LdQ2pkjo8SoYMr5p6k7VTvscFEOudhhqpPw=; b=wRylIbBKsXBYTEcXi4fMrOvUpPwGx6YIalHlWc6iBc/xW8q2SrFKtJcs0U11MPhSyR QnkgvCAHH8BkSKMeH9fXYquRGPY0BbpI9yIFohNIaLjg80w8H+GeWMy8GBh8HjFX/m1T RjXGSbmR4kOxpO9pW2ewGMdVPXymMRU8SlWH+sH+1RnAcEmM8cnvMJ8X8VDYj5Q0Slcy jqq67j7ytwD/pMNv2EuKjlJwiW1grV/6GHcp2/kL62sRQuERbS96OkXBGBX3sg7nEmEx MBTRINg5aeQstlJpABq3df0RRwfNn7s3NxF13w6YLqsueSfK54KwMLSGdhl/1VukriTG bOpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UnzyRxO8LdQ2pkjo8SoYMr5p6k7VTvscFEOudhhqpPw=; b=GqZL6pv5IvyYn8N8YVnSxfxCReniOer1pSWGCfO1LRzD7R84lggwDY7kImhbHDRKWu Fq7vyyALGNemwf9A/9sjz85n5tY7kuXAm48SP88ejRdcOlKzijLJIa3E5QtK053JuBSs nmGrDZE4iBgVfkJmLdTIia/3uKhTi2qtlv8iVUHnbq8mtjn2Ye9s7QzQLUeoT7txMZeO kxoIsWNuvJcVQIDAE/ysGUO6IMv0Kh0WYwJseqsZOd4RpvUkiCLDurxv5Gsg36feBYHq mK/v8nF0QIey20USvE6WDLzmwcLgHFAACXOq+oWrVz7kf/satxjt5Bj+Ip3FjrErQNsY lgAA== X-Gm-Message-State: APjAAAX0k5CXkmrKaSu5nqejxTKPrFxKs4B51uKu7PNYMcVtbKwVH2z8 fdDRwUNrdH4li89CPn6ooOMAYQ== X-Received: by 2002:adf:fe09:: with SMTP id n9mr84665697wrr.41.1563878515157; Tue, 23 Jul 2019 03:41:55 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o7sm14676591wru.58.2019.07.23.03.41.51 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 23 Jul 2019 03:41:52 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 21E351FF87; Tue, 23 Jul 2019 11:36:14 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 23 Jul 2019 11:36:09 +0100 Message-Id: <20190723103612.5600-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org> References: <20190723103612.5600-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PULL 20/23] tests/qemu-iotests/check: Allow tests without groups X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Thomas Huth , "open list:Block layer core" , qemu-devel@nongnu.org, Max Reitz , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The regular expressions in the "check" script currently expect that there is always a space after the test number in the group file, so you can't have a test in there without a group unless the line still ends with a space - which is quite error prone since some editors might remove spaces at the end of lines automatically. Thus let's fix the regular expressions so that it is also possible to have lines with one test number only in the group file. Suggested-by: Max Reitz Reviewed-by: Alex Bennée Reviewed-by: Max Reitz Signed-off-by: Thomas Huth Message-Id: <20190717111947.30356-2-thuth@redhat.com> Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index f925606cc52..c24874ff4aa 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -488,7 +488,7 @@ testlist options BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \ | while read id do - if grep -s "^$id " "$source_iotests/group" >/dev/null + if grep -s "^$id\( \|\$\)" "$source_iotests/group" >/dev/null then # in group file ... OK echo $id >>$tmp.list @@ -547,7 +547,7 @@ else touch $tmp.list else # no test numbers, do everything from group file - sed -n -e '/^[0-9][0-9][0-9]*/s/[ ].*//p' <"$source_iotests/group" >$tmp.list + sed -n -e '/^[0-9][0-9][0-9]*/s/^\([0-9]*\).*/\1/p' <"$source_iotests/group" >$tmp.list fi fi