From 50c947b53c26ac1dad954899da6eabb88ae84914 Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Mon, 9 Sep 2019 10:21:52 -0700 Subject: [PATCH] auto-t: set CONFIGURATION_DIRECTORY The --config option was removed, so any tests which start IWD from python need to set this option if they need a special configuration directory. --- autotests/util/iwd.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/autotests/util/iwd.py b/autotests/util/iwd.py index 422f973d..3f9d4a32 100755 --- a/autotests/util/iwd.py +++ b/autotests/util/iwd.py @@ -858,9 +858,9 @@ class IWD(AsyncOpAbstract): args.append('--leak-check=full') args.append('--log-file=/tmp/valgrind.log') + os.environ["CONFIGURATION_DIRECTORY"] = iwd_config_dir; + args.append('iwd') - args.append('-c') - args.append(iwd_config_dir) args.append('-p') args.append(whitelist) args.append('-d') @@ -900,6 +900,8 @@ class IWD(AsyncOpAbstract): self._iwd_proc = None + del os.environ["CONFIGURATION_DIRECTORY"] + @property def _object_manager(self): if self._object_manager_if is None: