Revert [test] Split LLDB tests into API, Shell & Unit

as it appears to have broken check-lldb.

This reverts r374184 (git commit 22314179f0660c172514b397060fd8f34b586e82)

llvm-svn: 374187

2 files changed, 0 insertions, 41 deletions

diff --git a/lldb/test/Shell/Watchpoint/Inputs/main.cpp b/lldb/test/Shell/Watchpoint/Inputs/main.cpp
deleted file mode 100644
index 9bc5724b9c8..00000000000
--- a/lldb/test/Shell/Watchpoint/Inputs/main.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <stdio.h>
-
-int main (int argc, char const *argv[])
-{
-    struct {
-        int a;
-        int b;
-        int c;
-    } MyAggregateDataType;
-
-    printf ("Set break point at this line.\n");
-    return 0;
-}
diff --git a/lldb/test/Shell/Watchpoint/SetErrorCases.test b/lldb/test/Shell/Watchpoint/SetErrorCases.test
deleted file mode 100644
index 39556f98f96..00000000000
--- a/lldb/test/Shell/Watchpoint/SetErrorCases.test
+++ /dev/null
@@ -1,28 +0,0 @@
-# RUN: %clangxx %p/Inputs/main.cpp -g -o %t.out
-# RUN: %lldb -b -o 'settings set interpreter.stop-command-source-on-error false' -s %s %t.out 2>&1 | FileCheck %s
-
-settings show interpreter.stop-command-source-on-error
-# CHECK: interpreter.stop-command-source-on-error (boolean) = false
-
-b main.cpp:11
-run
-# CHECK: stopped
-# CHECK-NEXT: stop reason = breakpoint
-
-watchpoint set
-# CHECK: Commands for setting a watchpoint.
-# CHECK: The following subcommands are supported:
-# CHECK: Set a watchpoint on an address by supplying an expression.
-# CHECK: Set a watchpoint on a variable.
-
-watchpoint set variable -w read_write
-# CHECK: error: required argument missing
-
-watchpoint set expression -w write --
-# CHECK: error: expression evaluation of address to watch failed
-
-watchpoint set expression MyAggregateDataType
-# CHECK: error: expression did not evaluate to an address
-
-watchpoint set variable -s -128
-# CHECK: error: invalid enumeration value