diff --git a/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py index bafc762829621..13ab6b0c9ac1f 100644 --- a/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py +++ b/lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py @@ -10,7 +10,6 @@ class TestCase(TestBase): @add_test_categories(["libc++"]) @skipIf(compiler=no_match("clang")) - @skipIfLinux # https://discourse.llvm.org/t/lldb-test-failures-on-linux/80095 def test(self): self.build() diff --git a/lldb/test/API/commands/expression/import-std-module/array/main.cpp b/lldb/test/API/commands/expression/import-std-module/array/main.cpp index 9bcd0b574042a..b71e4f876769d 100644 --- a/lldb/test/API/commands/expression/import-std-module/array/main.cpp +++ b/lldb/test/API/commands/expression/import-std-module/array/main.cpp @@ -1,5 +1,10 @@ +#include <__verbose_abort> #include +// Some expressons from the test need this symbol to be compiled when libcxx is +// built statically. +void *libcpp_verbose_abort_ptr = (void *)&std::__libcpp_verbose_abort; + struct DbgInfo { int v = 4; }; diff --git a/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py index 71eaeef20e792..1c32222e64f14 100644 --- a/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py +++ b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py @@ -14,7 +14,6 @@ class TestDbgInfoContentVector(TestBase): @skipIf(compiler="clang", compiler_version=["<", "12.0"]) @skipIf(macos_version=["<", "14.0"]) @skipIfDarwin # https://github.com/llvm/llvm-project/issues/106475 - @skipIfLinux # https://discourse.llvm.org/t/lldb-test-failures-on-linux/80095 def test(self): self.build() diff --git a/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/main.cpp b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/main.cpp index 24c3fec75d2f5..30f74acdd5e36 100644 --- a/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/main.cpp +++ b/lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/main.cpp @@ -1,5 +1,10 @@ +#include <__verbose_abort> #include +// Some expressons from the test need this symbol to be compiled when libcxx is +// built statically. +void *libcpp_verbose_abort_ptr = (void *)&std::__libcpp_verbose_abort; + struct Foo { int a; }; diff --git a/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py index e9415fd53651f..a1f33271f39d2 100644 --- a/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py +++ b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py @@ -10,7 +10,6 @@ class TestVectorOfVectors(TestBase): @add_test_categories(["libc++"]) @skipIf(compiler=no_match("clang")) - @skipIfLinux # https://discourse.llvm.org/t/lldb-test-failures-on-linux/80095 def test(self): self.build() diff --git a/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/main.cpp b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/main.cpp index b5ada909e4397..158dcf7a5f680 100644 --- a/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/main.cpp +++ b/lldb/test/API/commands/expression/import-std-module/vector-of-vectors/main.cpp @@ -1,5 +1,10 @@ +#include <__verbose_abort> #include +// Some expressons from the test need this symbol to be compiled when libcxx is +// built statically. +void *libcpp_verbose_abort_ptr = (void *)&std::__libcpp_verbose_abort; + int main(int argc, char **argv) { std::vector > a = {{1, 2, 3}, {3, 2, 1}}; return 0; // Set break point at this line.