[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, 120 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/timeout/Makefile
deleted file mode 100644
index c9cff412c1b..00000000000
--- a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../make
-
-CXX_SOURCES := wait-a-while.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py b/lldb/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py
deleted file mode 100644
index 7862477001e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py
+++ /dev/null
@@ -1,80 +0,0 @@
-"""
-Test calling a function that waits a while, and make sure the timeout option to expr works.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class ExprCommandWithTimeoutsTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-
-        self.main_source = "wait-a-while.cpp"
-        self.main_source_spec = lldb.SBFileSpec(self.main_source)
-
-    @expectedFlakeyFreeBSD("llvm.org/pr19605")
-    @expectedFailureAll(
-        oslist=[
-            "windows"],
-        bugnumber="llvm.org/pr21765")
-    def test(self):
-        """Test calling std::String member function."""
-        self.build()
-
-        (target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(
-            self, 'stop here in main.', self.main_source_spec)
-
-        # First set the timeout too short, and make sure we fail.
-        options = lldb.SBExpressionOptions()
-        options.SetTimeoutInMicroSeconds(10)
-        options.SetUnwindOnError(True)
-
-        frame = thread.GetFrameAtIndex(0)
-
-        value = frame.EvaluateExpression("wait_a_while(1000000)", options)
-        self.assertTrue(value.IsValid())
-        self.assertFalse(value.GetError().Success())
-
-        # Now do the same thing with the command line command, and make sure it
-        # works too.
-        interp = self.dbg.GetCommandInterpreter()
-
-        result = lldb.SBCommandReturnObject()
-        return_value = interp.HandleCommand(
-            "expr -t 100 -u true -- wait_a_while(1000000)", result)
-        self.assertTrue(return_value == lldb.eReturnStatusFailed)
-
-        # Okay, now do it again with long enough time outs:
-
-        options.SetTimeoutInMicroSeconds(1000000)
-        value = frame.EvaluateExpression("wait_a_while (1000)", options)
-        self.assertTrue(value.IsValid())
-        self.assertTrue(value.GetError().Success())
-
-        # Now do the same thingwith the command line command, and make sure it
-        # works too.
-        interp = self.dbg.GetCommandInterpreter()
-
-        result = lldb.SBCommandReturnObject()
-        return_value = interp.HandleCommand(
-            "expr -t 1000000 -u true -- wait_a_while(1000)", result)
-        self.assertTrue(return_value == lldb.eReturnStatusSuccessFinishResult)
-
-        # Finally set the one thread timeout and make sure that doesn't change
-        # things much:
-
-        options.SetTimeoutInMicroSeconds(1000000)
-        options.SetOneThreadTimeoutInMicroSeconds(500000)
-        value = frame.EvaluateExpression("wait_a_while (1000)", options)
-        self.assertTrue(value.IsValid())
-        self.assertTrue(value.GetError().Success())
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/wait-a-while.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/timeout/wait-a-while.cpp
deleted file mode 100644
index ac37c5d243b..00000000000
--- a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/wait-a-while.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <stdio.h>
-#include <stdint.h>
-
-#include <chrono>
-#include <thread>
-
-
-int
-wait_a_while (int microseconds)
-{
-    int num_times = 0;
-    auto end_time = std::chrono::system_clock::now() + std::chrono::microseconds(microseconds);
-
-    while (1)
-    {
-        num_times++;
-        auto wait_time = end_time - std::chrono::system_clock::now();
-
-        std::this_thread::sleep_for(wait_time);
-        if (std::chrono::system_clock::now() > end_time)
-            break;
-    }
-    return num_times;
-}
-
-int
-main (int argc, char **argv)
-{
-    printf ("stop here in main.\n");
-    int num_times = wait_a_while (argc * 1000);
-    printf ("Done, took %d times.\n", num_times);
-
-    return 0;
-
-}