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

diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile
new file mode 100644
index 00000000000..0d70f259501
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile
@@ -0,0 +1,5 @@
+LEVEL = ../../make
+
+C_SOURCES := main.c
+
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/TestPersistentVariables.py b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/TestPersistentVariables.py
new file mode 100644
index 00000000000..57370f121b4
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/TestPersistentVariables.py
@@ -0,0 +1,53 @@
+"""
+Test that lldb persistent variables works correctly.
+"""
+
+from __future__ import print_function
+
+
+import lldb
+from lldbsuite.test.lldbtest import *
+
+
+class PersistentVariablesTestCase(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    def test_persistent_variables(self):
+        """Test that lldb persistent variables works correctly."""
+        self.build()
+
+        self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
+
+        self.runCmd("breakpoint set --source-pattern-regexp break")
+
+        self.runCmd("run", RUN_SUCCEEDED)
+
+        self.runCmd("expression int $i = i")
+
+        self.expect("expression $i == i",
+                    startstr="(bool) $0 = true")
+
+        self.expect("expression $i + 1",
+                    startstr="(int) $1 = 6")
+
+        self.expect("expression $i + 3",
+                    startstr="(int) $2 = 8")
+
+        self.expect("expression $2 + $1",
+                    startstr="(int) $3 = 14")
+
+        self.expect("expression $3",
+                    startstr="(int) $3 = 14")
+
+        self.expect("expression $2",
+                    startstr="(int) $2 = 8")
+
+        self.expect("expression (int)-2",
+                    startstr="(int) $4 = -2")
+
+        self.expect("expression $4 > (int)31",
+                    startstr="(bool) $5 = false")
+
+        self.expect("expression (long)$4",
+                    startstr="(long) $6 = -2")
diff --git a/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/main.c
new file mode 100644
index 00000000000..771bf4ad342
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/main.c
@@ -0,0 +1,13 @@
+//===-- main.c --------------------------------------------------*- C++ -*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+int main (int argc, char const *argv[])
+{
+    int i = 5;
+    return 0; // Set breakpoint here
+}