[lldb][test] Fix TestStdCXXDisassembly test for case when tests are linked with libc++ statically #98694
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) ChangesThe test expects 'libstdc++' or 'libc++' SO module in the module list. In case when static linking with libc++ is on by default, none of them may be present. Thus, USE_SYSTEM_STDLIB is added to ensure the presence of any of them. Full diff: https://github.com/llvm/llvm-project/pull/98694.diff 2 Files Affected:
diff --git a/lldb/test/API/lang/cpp/stl/Makefile b/lldb/test/API/lang/cpp/stl/Makefile
index 99998b20bcb05..8534fa9b00209 100644
--- a/lldb/test/API/lang/cpp/stl/Makefile
+++ b/lldb/test/API/lang/cpp/stl/Makefile
@@ -1,3 +1,5 @@
CXX_SOURCES := main.cpp
+USE_SYSTEM_STDLIB := 1
+
include Makefile.rules
diff --git a/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py b/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
index 1e1b0a4d621f0..cc46989f984b2 100644
--- a/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
+++ b/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
@@ -44,7 +44,7 @@ def test_stdcxx_disasm(self):
# module is the corresponding SBModule.
self.expect(
- lib_stdcxx, "Libraray StdC++ is located", exe=False, substrs=["lib"]
+ lib_stdcxx, "Library StdC++ is located", exe=False, substrs=["lib"]
)
self.runCmd("image dump symtab '%s'" % lib_stdcxx)
|
|
✅ With the latest revision this PR passed the Python code formatter. |
…h libc++ statically The test expects 'libstdc++' or 'libc++' SO module in the module list. In case when static linking with libc++ is on by default, none of them may be present. Thus, USE_SYSTEM_STDLIB is added to ensure presence of any of them.
dzhidzhoev
force-pushed
the
lldb/fix-TestStdCXXDisassembly-system
branch
from
e98b2f7 to
35db69b
Compare
|
Rebased&undrafted |
slydiman
added a commit
to slydiman/llvm-project
that referenced
this pull request
Oct 15, 2024
The path llvm#98694 was not enough. This test is still failed on the buildbot https://lab.llvm.org/staging/#/builders/195/builds/4438 Use `USE_LIBSTDCPP := 1` instead.
slydiman
added a commit
that referenced
this pull request
Oct 15, 2024
The patch #98694 was not enough. This test is still failed on the buildbot https://lab.llvm.org/staging/#/builders/195/builds/4438 Use `USE_LIBSTDCPP := 1` instead for non Darwin OS and skip the test if libstdc++.so is missing.
DanielCChen
pushed a commit
to DanielCChen/llvm-project
that referenced
this pull request
Oct 16, 2024
…inked with libc++ statically (llvm#98694) This is to fix buildbot failure https://lab.llvm.org/staging/#/builders/195/builds/4255. The test expects 'libstdc++' or 'libc++' SO module in the module list. In case when static linking with libc++ is on by default, none of them may be present. Thus, USE_SYSTEM_STDLIB is added to ensure the presence of any of them. --------- Co-authored-by: Vladimir Vereschaka <[email protected]>
DanielCChen
pushed a commit
to DanielCChen/llvm-project
that referenced
this pull request
Oct 16, 2024
The patch llvm#98694 was not enough. This test is still failed on the buildbot https://lab.llvm.org/staging/#/builders/195/builds/4438 Use `USE_LIBSTDCPP := 1` instead for non Darwin OS and skip the test if libstdc++.so is missing.
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.
This is to fix buildbot failure https://lab.llvm.org/staging/#/builders/195/builds/4255.
The test expects 'libstdc++' or 'libc++' SO module in the module list. In case when static linking with libc++ is on by default, none of them may be present.
Thus, USE_SYSTEM_STDLIB is added to ensure the presence of any of them.