[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 26/27] iotests: fix loading of common.config from tests/ subdir
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 26/27] iotests: fix loading of common.config from tests/ subdir |
Date: |
Thu, 4 Feb 2021 16:39:58 +0000 |
From: Daniel P. Berrangé <berrange@redhat.com>
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>
Message-Id: <20210204124834.774401-12-berrange@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@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
- [PULL 15/27] migration: Display the migration blockers, (continued)
- [PULL 15/27] migration: Display the migration blockers, Dr. David Alan Gilbert (git), 2021/02/04
- [PULL 16/27] block: push error reporting into bdrv_all_*_snapshot functions, Dr. David Alan Gilbert (git), 2021/02/04
- [PULL 17/27] migration: Make save_snapshot() return bool, not 0/-1, Dr. David Alan Gilbert (git), 2021/02/04
- [PULL 18/27] migration: stop returning errno from load_snapshot(), Dr. David Alan Gilbert (git), 2021/02/04
- [PULL 19/27] block: add ability to specify list of blockdevs during snapshot, Dr. David Alan Gilbert (git), 2021/02/04
- [PULL 20/27] block: allow specifying name of block device for vmstate storage, Dr. David Alan Gilbert (git), 2021/02/04
- [PULL 22/27] migration: control whether snapshots are ovewritten, Dr. David Alan Gilbert (git), 2021/02/04
- [PULL 23/27] migration: wire up support for snapshot device selection, Dr. David Alan Gilbert (git), 2021/02/04
- [PULL 21/27] block: rename and alter bdrv_all_find_snapshot semantics, Dr. David Alan Gilbert (git), 2021/02/04
- [PULL 25/27] iotests: add support for capturing and matching QMP events, Dr. David Alan Gilbert (git), 2021/02/04
- [PULL 26/27] iotests: fix loading of common.config from tests/ subdir,
Dr. David Alan Gilbert (git) <=
- [PULL 24/27] migration: introduce a delete_snapshot wrapper, Dr. David Alan Gilbert (git), 2021/02/04
- [PULL 27/27] migration: introduce snapshot-{save, load, delete} QMP commands, Dr. David Alan Gilbert (git), 2021/02/04
- Re: [PULL 00/27] migration queue, Peter Maydell, 2021/02/04
- [PULL 00/27] migration queue, Dr. David Alan Gilbert (git), 2021/02/08