[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/12] qemu-iotests: do not include common.rc in "ch
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 05/12] qemu-iotests: do not include common.rc in "check" |
Date: |
Wed, 9 Aug 2017 23:55:03 +0200 |
It only provides functions used by the test programs.
Signed-off-by: Paolo Bonzini <address@hidden>
---
tests/qemu-iotests/check | 6 ------
tests/qemu-iotests/common.rc | 13 +++++--------
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 5075029e89..1ef6d0ac3a 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -113,12 +113,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 ef5cdb3385..390aa81224 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
_fatal()
--
2.13.3
- [Qemu-devel] [PATCH 02/12] qemu-iotests: get rid of AWK_PROG, (continued)
- [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, 2017/08/09
- [Qemu-devel] [PATCH 05/12] qemu-iotests: do not include common.rc in "check",
Paolo Bonzini <=
- [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
- [Qemu-devel] [PATCH 12/12] qemu-iotests: merge "check" and "common", Paolo Bonzini, 2017/08/09