From 29872606d220420d53fde7cc5e3bea15f8da62e7 Mon Sep 17 00:00:00 2001 From: Raphael Isemann Date: Sun, 1 Sep 2019 09:12:37 +0000 Subject: [lldb] Restructure test folders to match LLDB command hierarchy Summary: As discussed on lldb-dev, this patch moves some LLDB tests into a hierarchy that more closely resembles the commands we use in the LLDB interpreter. This patch should only move tests that use the command interpreter and shouldn't touch any tests that primarily test the SB API. Reviewers: #lldb, jfb, JDevlieghere Reviewed By: #lldb, JDevlieghere Subscribers: dexonsmith, arphaman, JDevlieghere, lldb-commits Tags: #lldb Differential Revision: https://reviews.llvm.org/D67033 llvm-svn: 370605 --- .../test/expression_command/scoped_enums/Makefile | 6 --- .../scoped_enums/TestScopedEnumType.py | 45 ---------------------- .../test/expression_command/scoped_enums/main.cpp | 16 -------- 3 files changed, 67 deletions(-) delete mode 100644 lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/Makefile delete mode 100644 lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/TestScopedEnumType.py delete mode 100644 lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/main.cpp (limited to 'lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums') diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/Makefile deleted file mode 100644 index 83b24da17b4..00000000000 --- a/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -LEVEL = ../../make - -CXX_SOURCES := main.cpp -CXXFLAGS += -std=c++11 - -include $(LEVEL)/Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/TestScopedEnumType.py b/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/TestScopedEnumType.py deleted file mode 100644 index e7bc79d8e7c..00000000000 --- a/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/TestScopedEnumType.py +++ /dev/null @@ -1,45 +0,0 @@ -from __future__ import print_function - - -import lldb -from lldbsuite.test.decorators import * -from lldbsuite.test.lldbtest import * -from lldbsuite.test import lldbutil - - -class ScopedEnumType(TestBase): - - mydir = TestBase.compute_mydir(__file__) - - @skipIf(dwarf_version=['<', '4']) - def test(self): - self.build() - - self.main_source = "main.cpp" - self.main_source_spec = lldb.SBFileSpec(self.main_source) - (target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(self, - '// Set break point at this line.', self.main_source_spec) - frame = thread.GetFrameAtIndex(0) - - self.expect("expr f == Foo::FooBar", - substrs=['(bool) $0 = true']) - - value = frame.EvaluateExpression("f == Foo::FooBar") - self.assertTrue(value.IsValid()) - self.assertTrue(value.GetError().Success()) - self.assertEqual(value.GetValueAsUnsigned(), 1) - - value = frame.EvaluateExpression("b == BarBar") - self.assertTrue(value.IsValid()) - self.assertTrue(value.GetError().Success()) - self.assertEqual(value.GetValueAsUnsigned(), 1) - - ## b is not a Foo - value = frame.EvaluateExpression("b == Foo::FooBar") - self.assertTrue(value.IsValid()) - self.assertFalse(value.GetError().Success()) - - ## integral is not implicitly convertible to a scoped enum - value = frame.EvaluateExpression("1 == Foo::FooBar") - self.assertTrue(value.IsValid()) - self.assertFalse(value.GetError().Success()) diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/main.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/main.cpp deleted file mode 100644 index b0d67d23dc5..00000000000 --- a/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/main.cpp +++ /dev/null @@ -1,16 +0,0 @@ -enum class Foo { - FooBar = 42 -}; - -enum Bar { - BarBar = 3, - BarBarBar = 42 -}; - -int main(int argc, const char **argv) { - Foo f = Foo::FooBar; - Bar b = BarBar; - bool b1 = f == Foo::FooBar; - bool b2 = b == BarBar; - return 0; // Set break point at this line. -} -- cgit v1.2.3