[lldb][test] Provide proper path to LLVM utils in API tests #110837
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-lldb Author: Vladislav Dzhidzhoev (dzhidzhoev) ChangesIn aea0668, API tests were supposed to use LLVM tools. Hence, it's fixed here. Full diff: https://github.com/llvm/llvm-project/pull/110837.diff 1 Files Affected:
diff --git a/lldb/packages/Python/lldbsuite/test/builders/builder.py b/lldb/packages/Python/lldbsuite/test/builders/builder.py
index e3099219e437e3..d5321f13b47488 100644
--- a/lldb/packages/Python/lldbsuite/test/builders/builder.py
+++ b/lldb/packages/Python/lldbsuite/test/builders/builder.py
@@ -153,7 +153,7 @@ def getToolchainSpec(self, compiler):
cc_dir = cc_path.parent
def getToolchainUtil(util_name):
- return os.path.join(configuration.llvm_tools_dir, util_name + exe_ext)
+ return os.path.join(configuration.llvm_tools_dir, "llvm-" + util_name + exe_ext)
cxx = cc_dir / (cc_prefix + cxx_type + cc_ext)
|
|
✅ With the latest revision this PR passed the Python code formatter. |
dzhidzhoev
force-pushed
the
lldb/proper-llvm-utils-path
branch
from
2036458 to
8deb61b
Compare
In aea0668, API tests were supposed to be switched to LLVM tools usage. However, a path to an utility is made up incorrectly there: util name should be prefixed with `llvm-`. Hence it is fixed here.
dzhidzhoev
force-pushed
the
lldb/proper-llvm-utils-path
branch
from
8deb61b to
a2c8b8b
Compare
labath
approved these changes
Oct 3, 2024
DavidSpickett
added a commit
that referenced
this pull request
Oct 8, 2024
Originally failing due to #24901, but since #110837 the test is passing. https://lab.llvm.org/buildbot/#/builders/141/builds/3012 My guess is that the `llvm-` tool has better support for static libraries on Windows.
|
@DavidSpickett thank you for the fixes! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In aea0668, API tests were supposed to use LLVM tools.
However, a path to a utility is made up incorrectly there: util name should be prefixed with
llvm-.Hence, it's fixed here.