ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-iotests: get rid of AWK_PROG 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Paolo Bonzini 2017-09-12 16:44:51 +02:00 committed by Kevin Wolf
parent f06a8dcfc6
commit 9ee4b6f803
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/qemu-iotests/check
View File

@ -128,7 +128,7 @@ tmp="${TEST_DIR}"/$$
_wallclock() _wallclock()
{ {
date "+%H %M %S" | $AWK_PROG '{ print $1*3600 + $2*60 + $3 }' date "+%H %M %S" | awk '{ print $1*3600 + $2*60 + $3 }'
} }
_timestamp() _timestamp()
@ -147,7 +147,7 @@ _wrapup()
if [ -f $TIMESTAMP_FILE -a -f $tmp.time ] if [ -f $TIMESTAMP_FILE -a -f $tmp.time ]
then then
cat $TIMESTAMP_FILE $tmp.time \ cat $TIMESTAMP_FILE $tmp.time \
| $AWK_PROG ' | awk '
{ t[$1] = $2 } { t[$1] = $2 }
END { if (NR > 0) { END { if (NR > 0) {
for (i in t) print i " " t[i] for (i in t) print i " " t[i]

2
tests/qemu-iotests/common
View File

@ -366,7 +366,7 @@ testlist options
if $xpand if $xpand
then then
have_test_arg=true have_test_arg=true
$AWK_PROG </dev/null ' awk </dev/null '
BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \ BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
| while read id | while read id
do do

3
tests/qemu-iotests/common.config
View File

@ -56,9 +56,6 @@ _fatal()
exit 1 exit 1
} }
export AWK_PROG="`set_prog_path awk`"
[ "$AWK_PROG" = "" ] && _fatal "awk not found"
if [ -z "$QEMU_PROG" ]; then if [ -z "$QEMU_PROG" ]; then
export QEMU_PROG="`set_prog_path qemu`" export QEMU_PROG="`set_prog_path qemu`"
fi fi