[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PULL 25/27] iotests: fix loading of common.config from tests/ subdir

From: Dr. David Alan Gilbert (git)
Subject: [PULL 25/27] iotests: fix loading of common.config from tests/ subdir
Date: Mon, 8 Feb 2021 11:29:16 +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
+test -f $config || config=../common.config
+if ! test -f $config
+    echo "$0: failed to find common.config"
+    exit 1
+if ! . $config
     echo "$0: failed to source common.config"
     exit 1

reply via email to

[Prev in Thread] Current Thread [Next in Thread]