[Lldb-commits] [lldb] f035d9f - [lldb][test] Fix TestStdCXXDisassembly test for case when tests are linked with libc++ statically (#98694)

[via lldb-commits]

Author: Vladislav Dzhidzhoev
Date: 2024-10-15T14:22:59+04:00
New Revision: f035d9f061c3f54971f1baf3097989387dd511c1

URL: https://github.com/llvm/llvm-project/commit/f035d9f061c3f54971f1baf3097989387dd511c1
DIFF: https://github.com/llvm/llvm-project/commit/f035d9f061c3f54971f1baf3097989387dd511c1.diff

LOG: [lldb][test] Fix TestStdCXXDisassembly test for case when tests are linked with libc++ statically (#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 at accesssoftek.com>

Added: 
    

Modified: 
    lldb/test/API/lang/cpp/stl/Makefile
    lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/lang/cpp/stl/Makefile b/lldb/test/API/lang/cpp/stl/Makefile
index 99998b20bcb050..8534fa9b00209e 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 1e1b0a4d621f04..8676ee16d83c04 100644
--- a/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
+++ b/lldb/test/API/lang/cpp/stl/TestStdCXXDisassembly.py
@@ -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()