Skip to content

Commit 7f55ccf

Browse files
committed
Revert "[lldb][test] Fix some 'import-std-module' tests (llvm#122358)"
Summary: This reverts commit 61e2841. Revert of llvm#122358. This patch enables a test that takes a hard dependency on compiler version. We don't adhere to the upstream versioning schedule and so this test is erroneously failing. Test Plan: sandcastle_medieval_painting Reviewers: wanyi, hyubo Reviewed By: hyubo Subscribers: #lldb_team Differential Revision: https://phabricator.intern.facebook.com/D68337788
1 parent a6508f6 commit 7f55ccf

File tree

6 files changed

+3
-15
lines changed

6 files changed

+3
-15
lines changed

lldb/test/API/commands/expression/import-std-module/array/TestArrayFromStdModule.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
class TestCase(TestBase):
1111
@add_test_categories(["libc++"])
1212
@skipIf(compiler=no_match("clang"))
13+
@skipIfLinux # https://discourse.llvm.org/t/lldb-test-failures-on-linux/80095
1314
def test(self):
1415
self.build()
1516

lldb/test/API/commands/expression/import-std-module/array/main.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
#include <__verbose_abort>
21
#include <array>
32

4-
// Some expressons from the test need this symbol to be compiled when libcxx is
5-
// built statically.
6-
void *libcpp_verbose_abort_ptr = (void *)&std::__libcpp_verbose_abort;
7-
83
struct DbgInfo {
94
int v = 4;
105
};

lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVectorFromStdModule.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ class TestDbgInfoContentVector(TestBase):
1414
@skipIf(compiler="clang", compiler_version=["<", "12.0"])
1515
@skipIf(macos_version=["<", "14.0"])
1616
@skipIfDarwin # https://github.com/llvm/llvm-project/issues/106475
17+
@skipIfLinux # https://discourse.llvm.org/t/lldb-test-failures-on-linux/80095
1718
def test(self):
1819
self.build()
1920

lldb/test/API/commands/expression/import-std-module/vector-dbg-info-content/main.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
#include <__verbose_abort>
21
#include <vector>
32

4-
// Some expressons from the test need this symbol to be compiled when libcxx is
5-
// built statically.
6-
void *libcpp_verbose_abort_ptr = (void *)&std::__libcpp_verbose_abort;
7-
83
struct Foo {
94
int a;
105
};

lldb/test/API/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectorsFromStdModule.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
class TestVectorOfVectors(TestBase):
1111
@add_test_categories(["libc++"])
1212
@skipIf(compiler=no_match("clang"))
13+
@skipIfLinux # https://discourse.llvm.org/t/lldb-test-failures-on-linux/80095
1314
def test(self):
1415
self.build()
1516

lldb/test/API/commands/expression/import-std-module/vector-of-vectors/main.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
#include <__verbose_abort>
21
#include <vector>
32

4-
// Some expressons from the test need this symbol to be compiled when libcxx is
5-
// built statically.
6-
void *libcpp_verbose_abort_ptr = (void *)&std::__libcpp_verbose_abort;
7-
83
int main(int argc, char **argv) {
94
std::vector<std::vector<int> > a = {{1, 2, 3}, {3, 2, 1}};
105
return 0; // Set break point at this line.

0 commit comments

Comments
 (0)