On 08/09/2017 06:55 PM, Paolo Bonzini wrote:
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>


Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>

---
  tests/qemu-iotests/check         | 4 ++--
  tests/qemu-iotests/common        | 2 +-
  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 01fd5a26e5..5075029e89 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


Reply via email to