diff options
| author | Pavel Labath <labath@google.com> | 2016-02-02 09:49:37 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2016-02-02 09:49:37 +0000 |
| commit | e8baa4498dde732804b8012ee982142f0ca87fff (patch) | |
| tree | 2e74851c4583870b1bafc514de4f036613defb0a /lldb/packages/Python/lldbsuite/test/lldbtest.py | |
| parent | 6c2ae4592d84529557e7b2a9ef0e435dbacbab44 (diff) | |
| download | bcm5719-llvm-e8baa4498dde732804b8012ee982142f0ca87fff.tar.gz bcm5719-llvm-e8baa4498dde732804b8012ee982142f0ca87fff.zip | |
Fix compiler lookup when specified without path
r259433 introduced a regression, where if a compiler is specified without a path (e.g., CC=clang,
relying on the fact that clang is in $PATH), then the test suite would fail (at the compiler
version detection step) because realpath would interpret this as a path relative to cwd). The fix
is to perform the $PATH expansion (via `which`) before the realpath step.
llvm-svn: 259484
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/lldbtest.py')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/lldbtest.py | 3 |
1 files changed, 1 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: |
