[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v10 11/12] iotests: fix loading of common.config from tests/ subd
|
From: |
Daniel P . Berrangé |
|
Subject: |
[PATCH v10 11/12] iotests: fix loading of common.config from tests/ subdir |
|
Date: |
Tue, 2 Feb 2021 15:41:37 +0000 |
common.rc assumes it is being sourced from the same directory and
so also tries to source common.config from the current working
directory. With the ability to now have named tests in the tests/
subdir we need to check two locations for common.config.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/qemu-iotests/common.rc | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 297acf9b6a..77c37e8312 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -109,8 +109,14 @@ peek_file_raw()
dd if="$1" bs=1 skip="$2" count="$3" status=none
}
-
-if ! . ./common.config
+config=common.config
+test -f $config || config=../common.config
+if ! test -f $config
+then
+ echo "$0: failed to find common.config"
+ exit 1
+fi
+if ! . $config
then
echo "$0: failed to source common.config"
exit 1
--
2.29.2
- [PATCH v10 01/12] block: push error reporting into bdrv_all_*_snapshot functions, (continued)
- [PATCH v10 01/12] block: push error reporting into bdrv_all_*_snapshot functions, Daniel P . Berrangé, 2021/02/02
- [PATCH v10 02/12] migration: Make save_snapshot() return bool, not 0/-1, Daniel P . Berrangé, 2021/02/02
- [PATCH v10 03/12] migration: stop returning errno from load_snapshot(), Daniel P . Berrangé, 2021/02/02
- [PATCH v10 05/12] block: allow specifying name of block device for vmstate storage, Daniel P . Berrangé, 2021/02/02
- [PATCH v10 04/12] block: add ability to specify list of blockdevs during snapshot, Daniel P . Berrangé, 2021/02/02
- [PATCH v10 06/12] block: rename and alter bdrv_all_find_snapshot semantics, Daniel P . Berrangé, 2021/02/02
- [PATCH v10 08/12] migration: wire up support for snapshot device selection, Daniel P . Berrangé, 2021/02/02
- [PATCH v10 07/12] migration: control whether snapshots are ovewritten, Daniel P . Berrangé, 2021/02/02
- [PATCH v10 09/12] migration: introduce a delete_snapshot wrapper, Daniel P . Berrangé, 2021/02/02
- [PATCH v10 11/12] iotests: fix loading of common.config from tests/ subdir,
Daniel P . Berrangé <=
- [PATCH v10 10/12] iotests: add support for capturing and matching QMP events, Daniel P . Berrangé, 2021/02/02
- [PATCH v10 12/12] migration: introduce snapshot-{save, load, delete} QMP commands, Daniel P . Berrangé, 2021/02/02