diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2021-02-04 12:48:33 +0000 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2021-02-08 11:19:51 +0000 |
| commit | 458598e6a53077872da5defbe8c9642f6390c8d2 (patch) | |
| tree | b8391d81e4709ecc3fdc9d9340204a23e9173b25 | |
| parent | aae12d4baa1304756c073fac34ac53e6445f4fdf (diff) | |
| download | focaccia-qemu-458598e6a53077872da5defbe8c9642f6390c8d2.tar.gz focaccia-qemu-458598e6a53077872da5defbe8c9642f6390c8d2.zip | |
iotests: fix loading of common.config from tests/ subdir
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>
| -rw-r--r-- | tests/qemu-iotests/common.rc | 10 |
1 files 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 |