Author: Kendal Harland Date: 2024-07-26T10:43:58-07:00 New Revision: 3e593b9b3b86ebf28e24c3a33791be49e0735af5
URL: https://github.com/llvm/llvm-project/commit/3e593b9b3b86ebf28e24c3a33791be49e0735af5 DIFF: https://github.com/llvm/llvm-project/commit/3e593b9b3b86ebf28e24c3a33791be49e0735af5.diff LOG: [lldb] Remove python helper getCompilerBinary() (#100660) This causes a number of tests be `UNRESOLVED` on Windows if `getCompiler()` has a space in the name, because `getCompilerBinary()` unconditionally splits on whitespace and returns the first result, which might just be`"C:\Program"` if using a compiler such as `clang-cl` `cl` from the absolute path to Visual studio's installation directory. Co-authored-by: kendal <kendal@thebrowser.company> Added: Modified: lldb/packages/Python/lldbsuite/test/lldbplatformutil.py lldb/packages/Python/lldbsuite/test/lldbtest.py Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py b/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py index e3c6fd1a99568..602e15d207e94 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 5e50b0c145885..f97c41d867e78 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -1379,10 +1379,6 @@ def getCompiler(self): """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. _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
