[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, 49 insertions, 0 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile
new file mode 100644
index 00000000000..314f1cb2f07
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile
@@ -0,0 +1,5 @@
+LEVEL = ../../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py
new file mode 100644
index 00000000000..1251ad551ac
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py
@@ -0,0 +1,29 @@
+"""
+Test the output of `frame diagnose` for dereferencing `this`
+"""
+
+from __future__ import print_function
+
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+
+class TestDiagnoseDereferenceThis(TestBase):
+    mydir = TestBase.compute_mydir(__file__)
+
+    @skipUnlessDarwin
+    @skipIfDarwinEmbedded  # <rdar://problem/33842388> frame diagnose doesn't work for armv7 or arm64
+    def test_diagnose_dereference_this(self):
+        TestBase.setUp(self)
+        self.build()
+        exe = self.getBuildArtifact("a.out")
+        self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
+        self.runCmd("run", RUN_SUCCEEDED)
+        self.expect("thread list", "Thread should be stopped",
+                    substrs=['stopped'])
+        self.expect(
+            "frame diagnose",
+            "Crash diagnosis was accurate",
+            "this->a")
diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/main.cpp
new file mode 100644
index 00000000000..1f177230ed9
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/main.cpp
@@ -0,0 +1,15 @@
+struct Foo {
+  int a;
+  int b;
+  int Sum() { return a + b; }
+};
+
+struct Foo *GetAFoo() {
+  return (struct Foo*)0;
+}
+
+int main() {
+  struct Foo *foo = GetAFoo();
+  return foo->Sum();
+}
+