[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/12] qemu-iotests: include common.env and common.c
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 11/12] qemu-iotests: include common.env and common.config early |
Date: |
Wed, 9 Aug 2017 23:55:09 +0200 |
They are now very small and they do not have external dependencies. We
can source them as soon as we have their path.
Signed-off-by: Paolo Bonzini <address@hidden>
---
tests/qemu-iotests/check | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index dc60e17e6a..28b3444963 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -55,6 +55,18 @@ else
build_iotests=$PWD
fi
+# we need common.env
+if ! . "$build_iotests/common.env"
+then
+ _init_error "failed to source common.env (make sure the qemu-iotests are
run from tests/qemu-iotests in the build tree)"
+fi
+
+# we need common.config
+if ! . "$source_iotests/common.config"
+then
+ _init_error "failed to source common.config"
+fi
+
build_root="$build_iotests/../.."
if [ -x "$build_iotests/socket_scm_helper" ]
@@ -98,18 +110,6 @@ then
export QEMU_NBD_PROG="$build_root/qemu-nbd"
fi
-# we need common.env
-if ! . "$build_iotests/common.env"
-then
- _init_error "failed to source common.env (make sure the qemu-iotests are
run from tests/qemu-iotests in the build tree)"
-fi
-
-# we need common.config
-if ! . "$source_iotests/common.config"
-then
- _init_error "failed to source common.config"
-fi
-
# we need common
. "$source_iotests/common"
--
2.13.3
- [Qemu-devel] [PATCH 06/12] qemu-iotests: do not do useless search for QEMU_*_PROG, (continued)
- [Qemu-devel] [PATCH 06/12] qemu-iotests: do not do useless search for QEMU_*_PROG, Paolo Bonzini, 2017/08/09
- [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 <=
- [Qemu-devel] [PATCH 12/12] qemu-iotests: merge "check" and "common", Paolo Bonzini, 2017/08/09