From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Qik-0003Ig-LM for qemu-devel@nongnu.org; Thu, 03 Dec 2015 05:02:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a4Qie-0007jj-U5 for qemu-devel@nongnu.org; Thu, 03 Dec 2015 05:02:38 -0500 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:42920) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a4Qie-0007jB-BI for qemu-devel@nongnu.org; Thu, 03 Dec 2015 05:02:32 -0500 Received: from localhost by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 3 Dec 2015 20:02:28 +1000 Received: from d23relay10.au.ibm.com (d23relay10.au.ibm.com [9.190.26.77]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id 3D33B2CE8054 for ; Thu, 3 Dec 2015 21:02:26 +1100 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay10.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tB3A2IRI64618620 for ; Thu, 3 Dec 2015 21:02:26 +1100 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tB3A1rHp008182 for ; Thu, 3 Dec 2015 21:01:53 +1100 From: Bo Tu Date: Thu, 3 Dec 2015 18:01:29 +0800 Message-Id: <1449136891-26850-2-git-send-email-tubo@linux.vnet.ibm.com> In-Reply-To: <1449136891-26850-1-git-send-email-tubo@linux.vnet.ibm.com> References: <1449136891-26850-1-git-send-email-tubo@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v4 1/3] qemu-iotests: refine common.config List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, silbe@linux.vnet.ibm.com, mreitz@redhat.com, armbru@redhat.com, mimu@linux.vnet.ibm.com From: Bo Tu Replacing awk with sed, then it's easier to read. Replacing "[ ! -z "$default_alias_machine" ]" with "[[ $default_alias_machine ]]", then it's slightly shorter. Reviewed-by: Max Reitz Suggested-By: Sascha Silbe Reviewed-by: Sascha Silbe Reviewed-by: Eric Blake Signed-off-by: Bo Tu --- tests/qemu-iotests/common.config | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config index 3ed51b8..60bfabf 100644 --- a/tests/qemu-iotests/common.config +++ b/tests/qemu-iotests/common.config @@ -154,11 +154,10 @@ export QEMU_IMG=_qemu_img_wrapper export QEMU_IO=_qemu_io_wrapper export QEMU_NBD=_qemu_nbd_wrapper -default_machine=$($QEMU -machine \? | awk '/(default)/{print $1}') -default_alias_machine=$($QEMU -machine \? |\ - awk -v var_default_machine="$default_machine"\)\ - '{if ($(NF-2)=="(alias"&&$(NF-1)=="of"&&$(NF)==var_default_machine){print $1}}') -if [ ! -z "$default_alias_machine" ]; then +default_machine=$($QEMU -machine help | sed -n '/(default)/ s/ .*//p') +default_alias_machine=$($QEMU -machine help | \ + sed -n "/(alias of $default_machine)/ { s/ .*//p; q; }") +if [[ "$default_alias_machine" ]]; then default_machine="$default_alias_machine" fi -- 2.4.3