From 29872606d220420d53fde7cc5e3bea15f8da62e7 Mon Sep 17 00:00:00 2001
From: Raphael Isemann <teemperor@gmail.com>
Date: Sun, 1 Sep 2019 09:12:37 +0000
Subject: [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
---
 .../ir-interpreter-phi-nodes/Makefile              |  5 ---
 .../TestIRInterpreterPHINodes.py                   | 41 ----------------------
 .../ir-interpreter-phi-nodes/main.cpp              | 16 ---------
 3 files changed, 62 deletions(-)
 delete mode 100644 lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/Makefile
 delete mode 100644 lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
 delete mode 100644 lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/main.cpp

(limited to 'lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes')

diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/Makefile
deleted file mode 100644
index bf2c0b2c108..00000000000
--- a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../make
-
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py b/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
deleted file mode 100644
index 20a9477b1f7..00000000000
--- a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
+++ /dev/null
@@ -1,41 +0,0 @@
-"""
-Test PHI nodes work in the IR interpreter.
-"""
-
-
-import lldb
-from lldbsuite.test.lldbtest import *
-import lldbsuite.test.lldbutil as lldbutil
-
-
-class IRInterpreterPHINodesTestCase(TestBase):
-    mydir = TestBase.compute_mydir(__file__)
-
-    def test_phi_node_support(self):
-        """Test support for PHI nodes in the IR interpreter."""
-
-        self.build()
-        exe = self.getBuildArtifact("a.out")
-        self.runCmd('file ' + exe, CURRENT_EXECUTABLE_SET)
-
-        # Break on the first assignment to i
-        line = line_number('main.cpp', 'i = 5')
-        lldbutil.run_break_set_by_file_and_line(
-            self, 'main.cpp', line, num_expected_locations=1, loc_exact=True)
-
-        self.runCmd('run', RUN_SUCCEEDED)
-
-        # The stop reason of the thread should be breakpoint
-        self.expect('thread list', STOPPED_DUE_TO_BREAKPOINT,
-                    substrs=['stopped', 'stop reason = breakpoint'])
-
-        self.runCmd('s')
-
-        # The logical 'or' causes a PHI node to be generated. Execute without JIT
-        # to test that the interpreter can handle this
-        self.expect('expr -j 0 -- i == 3 || i == 5', substrs=['true'])
-
-        self.runCmd('s')
-        self.expect('expr -j 0 -- i == 3 || i == 5', substrs=['false'])
-        self.runCmd('s')
-        self.expect('expr -j 0 -- i == 3 || i == 5', substrs=['true'])
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/main.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/main.cpp
deleted file mode 100644
index 8e181aeba3b..00000000000
--- a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-//===-- main.cpp ------------------------------------------------*- 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 i;
-    i = 5;
-    i = 2;
-    i = 3;
-    return 0;
-}
-- 
cgit v1.2.3