aboutsummaryrefslogtreecommitdiff
path: root/lldb/packages/Python/lldbsuite/test
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
-rw-r--r--lldb/packages/Python/lldbsuite/test/lldbplatformutil.py10
-rw-r--r--lldb/packages/Python/lldbsuite/test/lldbtest.py4
2 files changed, 3 insertions, 11 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py b/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py
index e3c6fd1..602e15d 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py
@@ -266,17 +266,13 @@ def getCompiler():
return module.getCompiler()
-def getCompilerBinary():
- """Returns the compiler binary the test suite is running with."""
- return getCompiler().split()[0]
-
-
def getCompilerVersion():
"""Returns a string that represents the compiler version.
Supports: llvm, clang.
"""
- compiler = getCompilerBinary()
- version_output = subprocess.check_output([compiler, "--version"], errors="replace")
+ version_output = subprocess.check_output(
+ [getCompiler(), "--version"], errors="replace"
+ )
m = re.search("version ([0-9.]+)", version_output)
if m:
return m.group(1)
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 5e50b0c..f97c41d 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -1379,10 +1379,6 @@ class Base(unittest.TestCase):
"""Returns the compiler in effect the test suite is running with."""
return lldbplatformutil.getCompiler()
- def getCompilerBinary(self):
- """Returns the compiler binary the test suite is running with."""
- return lldbplatformutil.getCompilerBinary()
-
def getCompilerVersion(self):
"""Returns a string that represents the compiler version.
Supports: llvm, clang.