From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzriE-0004a7-KE for qemu-devel@nongnu.org; Tue, 02 Jun 2015 15:18:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzriD-0000T3-Hg for qemu-devel@nongnu.org; Tue, 02 Jun 2015 15:18:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35475) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzriD-0000Sq-Br for qemu-devel@nongnu.org; Tue, 02 Jun 2015 15:18:57 -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 13542B7CDD for ; Tue, 2 Jun 2015 19:18:57 +0000 (UTC) From: John Snow Date: Tue, 2 Jun 2015 15:18:38 -0400 Message-Id: <1433272721-24871-2-git-send-email-jsnow@redhat.com> In-Reply-To: <1433272721-24871-1-git-send-email-jsnow@redhat.com> References: <1433272721-24871-1-git-send-email-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH v3 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 awk 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 1030aaf..84b6f16 100644 --- a/tests/qemu-iotests/common +++ b/tests/qemu-iotests/common @@ -83,7 +83,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 }'` -- 2.1.0