From 8627209b43a430d4d91e93648bc1f30f93a756fc Mon Sep 17 00:00:00 2001 From: Enrico Granata Date: Fri, 30 Oct 2015 01:09:54 +0000 Subject: Some test cases that need the lldbExec path were failing because lldbExec was turning out to be None even though it was being validly set by dotest.py It turns out that lldbtest_config was being imported locally to "lldbsuite.test" instead of globally, so when the test cases got individually brought by a global import via __import__ by unittest2, they did not see the lldbtest_config import, and ended up importing a new separate copy of it, with lldbExec unset This is a simple hackaround that brings lldbtest_config to global visibility and makes sure the configuration data is correctly shared llvm-svn: 251678 --- lldb/packages/Python/lldbsuite/test/dotest.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lldb/packages/Python/lldbsuite/test') diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 7c08bac48db..0c569bc81e8 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -21,6 +21,10 @@ for available options. """ from __future__ import print_function +# this module needs to have global visibility, otherwise test cases +# will import it anew in their local namespace, essentially losing access +# to all the configuration data +globals()['lldbtest_config'] = __import__('lldbtest_config') import use_lldb_suite @@ -42,7 +46,6 @@ import test_results from test_results import EventBuilder import inspect import unittest2 -import lldbtest_config import test_categories import six -- cgit v1.2.3