[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

3 files changed, 0 insertions, 131 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/Makefile
deleted file mode 100644
index b6592745356..00000000000
--- a/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-LEVEL = ../../make
-
-OBJC_SOURCES := main.m
-
-include $(LEVEL)/Makefile.rules
-LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/TestContextObjectObjc.py b/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/TestContextObjectObjc.py
deleted file mode 100644
index 4ae4fd8680d..00000000000
--- a/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/TestContextObjectObjc.py
+++ /dev/null
@@ -1,78 +0,0 @@
-"""
-Tests expression evaluation in context of an objc class.
-"""
-
-import lldb
-import lldbsuite.test.lldbutil as lldbutil
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-
-class ContextObjectObjcTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    @skipUnlessDarwin
-    def test_context_object_objc(self):
-        """Tests expression evaluation in context of an objc class."""
-        self.build()
-
-        (target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(self, '// Break here', self.main_source_spec)
-        frame = thread.GetFrameAtIndex(0)
-
-        #
-        # Test objc class variable
-        #
-
-        obj_val = frame.FindVariable("objcClass")
-        self.assertTrue(obj_val.IsValid())
-        obj_val = obj_val.Dereference()
-        self.assertTrue(obj_val.IsValid())
-
-        # Test an empty expression evaluation
-        value = obj_val.EvaluateExpression("")
-        self.assertFalse(value.IsValid())
-        self.assertFalse(value.GetError().Success())
-
-        # Test retrieving of a field (not a local with the same name)
-        value = obj_val.EvaluateExpression("field")
-        self.assertTrue(value.IsValid())
-        self.assertTrue(value.GetError().Success())
-        self.assertEqual(value.GetValueAsSigned(), 1111)
-
-        # Test if the self pointer is properly evaluated
-
-        # Test retrieving of an objcClass's property through the self pointer
-        value = obj_val.EvaluateExpression("self.property")
-        self.assertTrue(value.IsValid())
-        self.assertTrue(value.GetError().Success())
-        self.assertEqual(value.GetValueAsSigned(), 2222)
-
-        # Test objcClass's methods evaluation through the self pointer
-        value = obj_val.EvaluateExpression("[self method]")
-        self.assertTrue(value.IsValid())
-        self.assertTrue(value.GetError().Success())
-        self.assertEqual(value.GetValueAsSigned(), 3333)
-
-        # Test if we can use a computation result reference object correctly
-
-        obj_val = frame.EvaluateExpression("[ObjcClass createNew]")
-        self.assertTrue(obj_val.IsValid())
-        obj_val = obj_val.Dereference()
-        self.assertTrue(obj_val.IsValid())
-
-        # Test an expression evaluation on it
-        value = obj_val.EvaluateExpression("1")
-        self.assertTrue(value.IsValid())
-        self.assertTrue(value.GetError().Success())
-
-        # Test retrieving of a field on it
-        value = obj_val.EvaluateExpression("field")
-        self.assertTrue(value.IsValid())
-        self.assertTrue(value.GetError().Success())
-        self.assertEqual(value.GetValueAsSigned(), 1111)
-
-    def setUp(self):
-        TestBase.setUp(self)
-
-        self.main_source = "main.m"
-        self.main_source_spec = lldb.SBFileSpec(self.main_source)
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/main.m b/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/main.m
deleted file mode 100644
index 5c495b24894..00000000000
--- a/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/main.m
+++ /dev/null
@@ -1,47 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface ObjcClass : NSObject {
-    int field;
-}
-
-@property int property;
-
-+(ObjcClass*)createNew;
-
--(id)init;
-
--(int)method;
-
-@end
-
-@implementation ObjcClass
-
-+(ObjcClass*)createNew {
-    return [ObjcClass new];
-}
-
--(id)init {
-    self = [super init];
-    if (self) {
-        field = 1111;
-        _property = 2222;
-    }
-    return self;
-}
-
--(int)method {
-    return 3333;
-}
-
-@end
-
-int main()
-{
-    @autoreleasepool {
-        ObjcClass* objcClass = [ObjcClass new];
-        
-        int field = 4444;
-        
-        return 0; // Break here
-    }
-}