Skip to content

Commit

Permalink
[lldb][test] Fix TestStdCXXDisassembly test for case when tests are l…
Browse files Browse the repository at this point in the history
…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 <vvereschaka@accesssoftek.com>
  • Loading branch information
dzhidzhoev and vvereschaka authored Oct 15, 2024
1 parent 1c6c850 commit f035d9f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 2 additions & 0 deletions lldb/test/API/lang/cpp/stl/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CXX_SOURCES := main.cpp

USE_SYSTEM_STDLIB := 1

include Makefile.rules
4 changes: 1 addition & 3 deletions lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ def test_stdcxx_disasm(self):
# At this point, lib_stdcxx is the full path to the stdc++ library and
# module is the corresponding SBModule.

self.expect(
lib_stdcxx, "Libraray StdC++ is located", exe=False, substrs=["lib"]
)
self.expect(lib_stdcxx, "Library StdC++ is located", exe=False, substrs=["lib"])

self.runCmd("image dump symtab '%s'" % lib_stdcxx)
raw_output = self.res.GetOutput()
Expand Down

0 comments on commit f035d9f

Please sign in to comment.