From: Bo Tu <tubo@linux.vnet.ibm.com>
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
Subject: [Qemu-devel] [PATCH v3 1/3] qemu-iotests: refine common.config
Date: Thu, 26 Nov 2015 17:53:12 +0800 [thread overview]
Message-ID: <1448531594-27192-2-git-send-email-tubo@linux.vnet.ibm.com> (raw)
In-Reply-To: <1448531594-27192-1-git-send-email-tubo@linux.vnet.ibm.com>
From: Bo Tu <tubo@linux.vnet.ibm.com>
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 <mreitz@redhat.com>
Suggested-By: Sascha Silbe <silbe@linux.vnet.ibm.com>
Reviewed-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Bo Tu <tubo@linux.vnet.ibm.com>
---
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
next prev parent reply other threads:[~2015-11-26 9:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-26 9:53 [Qemu-devel] [PATCH v3 0/3] Update tests/qemu-iotests failing cases for the s390 platform Bo Tu
2015-11-26 9:53 ` Bo Tu [this message]
2015-11-26 9:53 ` [Qemu-devel] [PATCH v3 2/3] qemu-iotests: s390x: fix test 051 Bo Tu
2015-11-30 19:38 ` Max Reitz
2015-12-01 7:35 ` tu bo
2015-12-02 15:48 ` Max Reitz
2015-12-03 9:49 ` tu bo
2015-11-26 9:53 ` [Qemu-devel] [PATCH v3 3/3] qemu-iotests: s390x: fix test 068 Bo Tu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1448531594-27192-2-git-send-email-tubo@linux.vnet.ibm.com \
--to=tubo@linux.vnet.ibm.com \
--cc=armbru@redhat.com \
--cc=kwolf@redhat.com \
--cc=mimu@linux.vnet.ibm.com \
--cc=mreitz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=silbe@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).