[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/12] qemu-iotests: do not do useless search for QE
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 06/12] qemu-iotests: do not do useless search for QEMU_*_PROG |
Date: |
Wed, 9 Aug 2017 23:55:04 +0200 |
With the exception of qnio_server, all the variables are initialized
by "check" prior to "common" being sourced. They cannot be empty.
Only the "realpath" invocation is useful, and can be done just once
in "check" rather than in the tests.
For qnio_server, move the detection to "common", simplifying
set_prog_path to stop handling the unused second argument, and
embedding the "realpath" pass.
Signed-off-by: Paolo Bonzini <address@hidden>
---
tests/qemu-iotests/common | 19 ++++++++++++++
tests/qemu-iotests/common.config | 54 ----------------------------------------
2 files changed, 19 insertions(+), 54 deletions(-)
diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
index f58e56fc40..33557abe6c 100644
--- a/tests/qemu-iotests/common
+++ b/tests/qemu-iotests/common
@@ -42,6 +42,25 @@ _full_platform_details()
echo "$os/$platform $host $kernel"
}
+# $1 = prog to look for
+set_prog_path()
+{
+ p=`command -v $1 2> /dev/null`
+ if [ -n "$p" -a -x "$p" ]; then
+ realpath -- "$(type -p "$p")"
+ else
+ return 1
+ fi
+}
+
+export QEMU_PROG=$(realpath -- "$(type -p "$QEMU_PROG")")
+export QEMU_IMG_PROG=$(realpath -- "$(type -p "$QEMU_IMG_PROG")")
+export QEMU_IO_PROG=$(realpath -- "$(type -p "$QEMU_IO_PROG")")
+export QEMU_NBD_PROG=$(realpath -- "$(type -p "$QEMU_NBD_PROG")")
+if [ -z "$QEMU_VXHS_PROG" ]; then
+ export QEMU_VXHS_PROG="`set_prog_path qnio_server`"
+fi
+
diff="diff -u"
verbose=false
debug=false
diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config
index ee10c23672..9d535415b5 100644
--- a/tests/qemu-iotests/common.config
+++ b/tests/qemu-iotests/common.config
@@ -30,28 +30,6 @@ export _QEMU_HANDLE=0
# make sure we have a standard umask
umask 022
-# $1 = prog to look for, $2* = default pathnames if not found in $PATH
-set_prog_path()
-{
- p=`command -v $1 2> /dev/null`
- if [ -n "$p" -a -x "$p" ]; then
- echo $p
- return 0
- fi
- p=$1
-
- shift
- for f; do
- if [ -x $f ]; then
- echo $f
- return 0
- fi
- done
-
- echo ""
- return 1
-}
-
_optstr_add()
{
if [ -n "$1" ]; then
@@ -61,38 +39,6 @@ _optstr_add()
fi
}
-if [ -z "$QEMU_PROG" ]; then
- export QEMU_PROG="`set_prog_path qemu`"
-fi
-
-if [ -z "$QEMU_IMG_PROG" ]; then
- export QEMU_IMG_PROG="`set_prog_path qemu-img`"
-fi
-
-if [ -z "$QEMU_IO_PROG" ]; then
- export QEMU_IO_PROG="`set_prog_path qemu-io`"
-fi
-
-if [ -z "$QEMU_NBD_PROG" ]; then
- export QEMU_NBD_PROG="`set_prog_path qemu-nbd`"
-fi
-
-if [ -z "$QEMU_VXHS_PROG" ]; then
- export QEMU_VXHS_PROG="`set_prog_path qnio_server`"
-fi
-
-export QEMU_PROG=$(realpath -- "$(type -p "$QEMU_PROG")")
-export QEMU_IMG_PROG=$(realpath -- "$(type -p "$QEMU_IMG_PROG")")
-export QEMU_IO_PROG=$(realpath -- "$(type -p "$QEMU_IO_PROG")")
-export QEMU_NBD_PROG=$(realpath -- "$(type -p "$QEMU_NBD_PROG")")
-
-# This program is not built as part of qemu but (possibly) provided by the
-# system, so it may not be present at all
-if [ -n "$QEMU_VXHS_PROG" ]; then
- export QEMU_VXHS_PROG=$(realpath -- "$(type -p "$QEMU_VXHS_PROG")")
-fi
-
-
QEMU_IMG_EXTRA_ARGS=
if [ "$IMGOPTSSYNTAX" = "true" ]; then
QEMU_IMG_EXTRA_ARGS="--image-opts $QEMU_IMG_EXTRA_ARGS"
--
2.13.3
- [Qemu-devel] [PATCH 00/12] cleanup qemu-iotests, Paolo Bonzini, 2017/08/09
- [Qemu-devel] [PATCH 02/12] qemu-iotests: get rid of AWK_PROG, Paolo Bonzini, 2017/08/09
- [Qemu-devel] [PATCH 03/12] qemu-iotests: move "check" code out of common.rc, Paolo Bonzini, 2017/08/09
- [Qemu-devel] [PATCH 01/12] qemu-iotests: remove dead code, Paolo Bonzini, 2017/08/09
- [Qemu-devel] [PATCH 04/12] qemu-iotests: limit non-_PROG-suffixed variables to common.rc, Paolo Bonzini, 2017/08/09
- [Qemu-devel] [PATCH 06/12] qemu-iotests: do not do useless search for QEMU_*_PROG,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 05/12] qemu-iotests: do not include common.rc in "check", Paolo Bonzini, 2017/08/09
- [Qemu-devel] [PATCH 08/12] qemu-iotests: fix uninitialized variable, Paolo Bonzini, 2017/08/09
- [Qemu-devel] [PATCH 07/12] qemu-iotests: disintegrate more parts of common.config, Paolo Bonzini, 2017/08/09
- [Qemu-devel] [PATCH 09/12] qemu-iotests: do not search for binaries in the current directory, Paolo Bonzini, 2017/08/09
- [Qemu-devel] [PATCH 10/12] qemu-iotests: get rid of $iam, Paolo Bonzini, 2017/08/09
- [Qemu-devel] [PATCH 11/12] qemu-iotests: include common.env and common.config early, Paolo Bonzini, 2017/08/09