diff options
Diffstat (limited to 'lldb/packages/Python')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/lldbtest.py | 3 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/plugins/builder_base.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index 6097c07319e..6de199f8cd1 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -1945,11 +1945,10 @@ class Base(unittest2.TestCase): """ Returns a string that represents the compiler version. Supports: llvm, clang. """ - from .lldbutil import which version = 'unknown' compiler = self.getCompilerBinary() - version_output = system([[which(compiler), "-v"]])[1] + version_output = system([[compiler, "-v"]])[1] for line in version_output.split(os.linesep): m = re.search('version ([0-9\.]+)', line) if m: diff --git a/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py b/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py index f4c80569208..0cff14c2269 100644 --- a/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py +++ b/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py @@ -15,6 +15,7 @@ variable. import os, sys import platform import lldbsuite.test.lldbtest as lldbtest +import lldbsuite.test.lldbutil as lldbutil def getArchitecture(): """Returns the architecture in effect the test suite is running with.""" @@ -23,6 +24,7 @@ def getArchitecture(): def getCompiler(): """Returns the compiler in effect the test suite is running with.""" compiler = os.environ.get("CC", "clang") + compiler = lldbutil.which(compiler) return os.path.realpath(compiler) def getArchFlag(): |
