From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YvtNg-0007rR-Em for qemu-devel@nongnu.org; Fri, 22 May 2015 16:17:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YvtNc-0002hs-FM for qemu-devel@nongnu.org; Fri, 22 May 2015 16:17:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60761) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YvtNc-0002hn-AI for qemu-devel@nongnu.org; Fri, 22 May 2015 16:17:16 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 0BDD8BAEF9 for ; Fri, 22 May 2015 20:17:16 +0000 (UTC) From: John Snow Date: Fri, 22 May 2015 16:17:09 -0400 Message-Id: <1432325832-12887-2-git-send-email-jsnow@redhat.com> In-Reply-To: <1432325832-12887-1-git-send-email-jsnow@redhat.com> References: <1432325832-12887-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH 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, John Snow 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..c4d0742 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 + grep -oh -E "^([0-9]{3,})" "${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 }'` -- 2.1.0