[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v11 11/12] iotests: fix loading of common.config from tests/ subd
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v11 11/12] iotests: fix loading of common.config from tests/ subdir |
Date: |
Thu, 4 Feb 2021 12:48:33 +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.
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
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 v11 01/12] block: push error reporting into bdrv_all_*_snapshot functions, (continued)
- [PATCH v11 01/12] block: push error reporting into bdrv_all_*_snapshot functions, Daniel P . Berrangé, 2021/02/04
- [PATCH v11 02/12] migration: Make save_snapshot() return bool, not 0/-1, Daniel P . Berrangé, 2021/02/04
- [PATCH v11 03/12] migration: stop returning errno from load_snapshot(), Daniel P . Berrangé, 2021/02/04
- [PATCH v11 04/12] block: add ability to specify list of blockdevs during snapshot, Daniel P . Berrangé, 2021/02/04
- [PATCH v11 05/12] block: allow specifying name of block device for vmstate storage, Daniel P . Berrangé, 2021/02/04
- [PATCH v11 06/12] block: rename and alter bdrv_all_find_snapshot semantics, Daniel P . Berrangé, 2021/02/04
- [PATCH v11 07/12] migration: control whether snapshots are ovewritten, Daniel P . Berrangé, 2021/02/04
- [PATCH v11 09/12] migration: introduce a delete_snapshot wrapper, Daniel P . Berrangé, 2021/02/04
- [PATCH v11 08/12] migration: wire up support for snapshot device selection, Daniel P . Berrangé, 2021/02/04
- [PATCH v11 10/12] iotests: add support for capturing and matching QMP events, Daniel P . Berrangé, 2021/02/04
- [PATCH v11 11/12] iotests: fix loading of common.config from tests/ subdir,
Daniel P . Berrangé <=
- [PATCH v11 12/12] migration: introduce snapshot-{save, load, delete} QMP commands, Daniel P . Berrangé, 2021/02/04
- Re: [PATCH v11 12/12] migration: introduce snapshot-{save, load, delete} QMP commands, Dr. David Alan Gilbert, 2021/02/04
- Re: [PATCH v11 12/12] migration: introduce snapshot-{save,load,delete} QMP commands, Eric Blake, 2021/02/04
- Re: [PATCH v11 12/12] migration: introduce snapshot-{save,load,delete} QMP commands, John Snow, 2021/02/16
- Re: [PATCH v11 00/12] migration: bring improved savevm/loadvm/delvm to QMP, Dr. David Alan Gilbert, 2021/02/04