Skip to content

Commit de7f7ea

Browse files
authored
[lldb][test] Fix TestStdCXXDisassembly test (#112357)
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.
1 parent 46200fc commit de7f7ea

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

lldb/test/API/lang/cpp/stl/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
CXX_SOURCES := main.cpp
22

3-
USE_SYSTEM_STDLIB := 1
3+
ifneq ($(OS),Darwin)
4+
USE_LIBSTDCPP := 1
5+
else
6+
USE_SYSTEM_STDLIB := 1
7+
endif
48

59
include Makefile.rules

lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ def test_stdcxx_disasm(self):
4343
# At this point, lib_stdcxx is the full path to the stdc++ library and
4444
# module is the corresponding SBModule.
4545

46-
self.expect(lib_stdcxx, "Library StdC++ is located", exe=False, substrs=["lib"])
46+
if "lib" not in lib_stdcxx:
47+
self.skipTest(
48+
"This test requires libstdc++.so or libc++.dylib in the target's module list."
49+
)
4750

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

0 commit comments

Comments
 (0)