diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-09-12 16:44:51 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-10-06 16:28:58 +0200 |
| commit | 9ee4b6f803335d23e3b6fe21c139707918c3eb24 (patch) | |
| tree | 12aaf438dedd89301e2dc028a6945d17418f8beb | |
| parent | f06a8dcfc6d51cdcd51f4320b895680cbbc872a9 (diff) | |
| download | focaccia-qemu-9ee4b6f803335d23e3b6fe21c139707918c3eb24.tar.gz focaccia-qemu-9ee4b6f803335d23e3b6fe21c139707918c3eb24.zip | |
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>
| -rwxr-xr-x | tests/qemu-iotests/check | 4 | ||||
| -rw-r--r-- | tests/qemu-iotests/common | 2 | ||||
| -rw-r--r-- | tests/qemu-iotests/common.config | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check index 041780b09f..67da67bd54 100755 --- a/tests/qemu-iotests/check +++ b/tests/qemu-iotests/check @@ -128,7 +128,7 @@ tmp="${TEST_DIR}"/$$ _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() @@ -147,7 +147,7 @@ _wrapup() if [ -f $TIMESTAMP_FILE -a -f $tmp.time ] then cat $TIMESTAMP_FILE $tmp.time \ - | $AWK_PROG ' + | awk ' { t[$1] = $2 } END { if (NR > 0) { for (i in t) print i " " t[i] diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common index 867918895b..130f647a4d 100644 --- a/tests/qemu-iotests/common +++ b/tests/qemu-iotests/common @@ -366,7 +366,7 @@ testlist options if $xpand then have_test_arg=true - $AWK_PROG </dev/null ' + awk </dev/null ' BEGIN { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \ | while read id do diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config index b599c72211..0f571d46eb 100644 --- a/tests/qemu-iotests/common.config +++ b/tests/qemu-iotests/common.config @@ -56,9 +56,6 @@ _fatal() exit 1 } -export AWK_PROG="`set_prog_path awk`" -[ "$AWK_PROG" = "" ] && _fatal "awk not found" - if [ -z "$QEMU_PROG" ]; then export QEMU_PROG="`set_prog_path qemu`" fi |