From 3817ce03bf3373065c25e389ecb7f23a511ebcdc Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 12 Sep 2017 16:44:55 +0200
Subject: qemu-iotests: do not include common.rc in "check"
It only provides functions used by the test programs.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/check | 6 ------
tests/qemu-iotests/common.rc | 13 +++++--------
2 files changed, 5 insertions(+), 14 deletions(-)
(limited to 'tests/qemu-iotests')
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 03871d0681..e39680ade2 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -72,12 +72,6 @@ then
_init_error "failed to source common.config"
fi
-# we need common.rc
-if ! . "$source_iotests/common.rc"
-then
- _init_error "failed to source common.rc"
-fi
-
# we need common
. "$source_iotests/common"
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index e7f74b4dbd..20f6821a69 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -40,14 +40,11 @@ poke_file()
printf "$3" | dd "of=$1" bs=1 "seek=$2" conv=notrunc &>/dev/null
}
-# we need common.config
-if [ "$iam" != "check" ]
-then
- if ! . ./common.config
- then
- echo "$iam: failed to source common.config"
- exit 1
- fi
+
+if ! . ./common.config
+ then
+ echo "$iam: failed to source common.config"
+ exit 1
fi
_qemu_wrapper()
--
cgit v1.2.3