From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43114) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzSb1-0008UG-Dj for qemu-devel@nongnu.org; Mon, 01 Jun 2015 12:29:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzSay-0005Sw-7y for qemu-devel@nongnu.org; Mon, 01 Jun 2015 12:29:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55092) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzSay-0005Sr-26 for qemu-devel@nongnu.org; Mon, 01 Jun 2015 12:29:48 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 73C152D125F for ; Mon, 1 Jun 2015 16:29:47 +0000 (UTC) Message-ID: <556C887A.6010109@redhat.com> Date: Mon, 01 Jun 2015 12:29:46 -0400 From: John Snow MIME-Version: 1.0 References: <1432831521-11972-1-git-send-email-jsnow@redhat.com> <1432831521-11972-2-git-send-email-jsnow@redhat.com> In-Reply-To: <1432831521-11972-2-git-send-email-jsnow@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 1/4] iotests: fix exclusion option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com On 05/28/2015 12:45 PM, John Snow wrote: > If you are running out-of-tree, the -x option to exclude > a certain iotest is broken. > > Replace porcelain usage of ls with a sturdier grep command. > > Signed-off-by: John Snow > --- > tests/qemu-iotests/common | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common > index 1e556bb..3949d18 100644 > --- a/tests/qemu-iotests/common > +++ b/tests/qemu-iotests/common > @@ -82,7 +82,8 @@ s/ .*//p > elif $xgroup > then > # arg after -x > - [ ! -s $tmp.list ] && ls [0-9][0-9][0-9] [0-9][0-9][0-9][0-9] >$tmp.list 2>/dev/null > + # Populate $tmp.list with all tests > + awk '/^[0-9]{3,}/ {print $1}' "${source_iotests}/group" > $tmp.list 2>/dev/null > group_list=`sed -n <"$source_iotests/group" -e 's/$/ /' -e "/^[0-9][0-9][0-9].* $r /"'{ > s/ .*//p > }'` > s/grep/awk/ Does this look good otherwise? --js