https://github.com/dzhidzhoev created
https://github.com/llvm/llvm-project/pull/98694
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.
>From e98b2f73269ba4e8f1a980ffb2b2765d1de5f655 Mon Sep 17 00:00:00 2001
From: Vladimir Vereschaka <vveresch...@accesssoftek.com>
Date: Thu, 30 May 2024 03:04:58 +0000
Subject: [PATCH] [lldb][test] Fix TestStdCXXDisassembly test when tests are
linked with 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.
---
lldb/test/API/lang/cpp/stl/Makefile | 2 ++
lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
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)
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
