Move top level test dirs inlined_breakpoints, load_unload, and embedded_interpreter to reside under functionalities.

llvm-svn: 133918

15 files changed, 5 insertions, 5 deletions

diff --git a/lldb/test/inlined_breakpoints/Makefile b/lldb/test/functionalities/breakpoint/inlined_breakpoints/Makefile
index 7f155e15aae..5b73ae626f3 100644
--- a/lldb/test/inlined_breakpoints/Makefile
+++ b/lldb/test/functionalities/breakpoint/inlined_breakpoints/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 CXX_SOURCES := int.cpp
 
diff --git a/lldb/test/inlined_breakpoints/TestInlinedBreakpoints.py b/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
index be512844a43..6e2706fbb34 100644
--- a/lldb/test/inlined_breakpoints/TestInlinedBreakpoints.py
+++ b/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
@@ -11,7 +11,7 @@ from lldbtest import *
 class InlinedBreakpointsTestCase(TestBase):
     """Bug fixed: rdar://problem/8464339"""
 
-    mydir = "inlined_breakpoints"
+    mydir = os.path.join("functionalities", "breakpoint", "inlined_breakpoints")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/inlined_breakpoints/basic_type.cpp b/lldb/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp
index 5881afe1f39..5881afe1f39 100644
--- a/lldb/test/inlined_breakpoints/basic_type.cpp
+++ b/lldb/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp
diff --git a/lldb/test/inlined_breakpoints/int.cpp b/lldb/test/functionalities/breakpoint/inlined_breakpoints/int.cpp
index 922398b1c6e..922398b1c6e 100644
--- a/lldb/test/inlined_breakpoints/int.cpp
+++ b/lldb/test/functionalities/breakpoint/inlined_breakpoints/int.cpp
diff --git a/lldb/test/embedded_interpreter/Makefile b/lldb/test/functionalities/embedded_interpreter/Makefile
index d6cd0db0506..0d70f259501 100644
--- a/lldb/test/embedded_interpreter/Makefile
+++ b/lldb/test/functionalities/embedded_interpreter/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/embedded_interpreter/TestConvenienceVariables.py b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
index 46450ae6323..2e5b2c13607 100644
--- a/lldb/test/embedded_interpreter/TestConvenienceVariables.py
+++ b/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
@@ -8,7 +8,7 @@ from lldbtest import *
 
 class ConvenienceVariablesCase(TestBase):
 
-    mydir = "embedded_interpreter"
+    mydir = os.path.join("functionalities", "embedded_interpreter")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/embedded_interpreter/main.c b/lldb/test/functionalities/embedded_interpreter/main.c
index 277aa54a4ee..277aa54a4ee 100644
--- a/lldb/test/embedded_interpreter/main.c
+++ b/lldb/test/functionalities/embedded_interpreter/main.c
diff --git a/lldb/test/load_unload/Makefile b/lldb/test/functionalities/load_unload/Makefile
index a77b507e52f..a77b507e52f 100644
--- a/lldb/test/load_unload/Makefile
+++ b/lldb/test/functionalities/load_unload/Makefile
diff --git a/lldb/test/load_unload/TestLoadUnload.py b/lldb/test/functionalities/load_unload/TestLoadUnload.py
index 0bceb4705ea..d3ebdc950b4 100644
--- a/lldb/test/load_unload/TestLoadUnload.py
+++ b/lldb/test/functionalities/load_unload/TestLoadUnload.py
@@ -10,7 +10,7 @@ from lldbtest import *
 
 class LoadUnloadTestCase(TestBase):
 
-    mydir = "load_unload"
+    mydir = os.path.join("functionalities", "load_unload")
 
     def setUp(self):
         # Call super's setUp().
diff --git a/lldb/test/load_unload/a.c b/lldb/test/functionalities/load_unload/a.c
index 9d4711772dd..9d4711772dd 100644
--- a/lldb/test/load_unload/a.c
+++ b/lldb/test/functionalities/load_unload/a.c
diff --git a/lldb/test/load_unload/b.c b/lldb/test/functionalities/load_unload/b.c
index 6c629323655..6c629323655 100644
--- a/lldb/test/load_unload/b.c
+++ b/lldb/test/functionalities/load_unload/b.c
diff --git a/lldb/test/load_unload/c.c b/lldb/test/functionalities/load_unload/c.c
index b1778b462d0..b1778b462d0 100644
--- a/lldb/test/load_unload/c.c
+++ b/lldb/test/functionalities/load_unload/c.c
diff --git a/lldb/test/load_unload/cmds.txt b/lldb/test/functionalities/load_unload/cmds.txt
index 1e4b198dc0d..1e4b198dc0d 100644
--- a/lldb/test/load_unload/cmds.txt
+++ b/lldb/test/functionalities/load_unload/cmds.txt
diff --git a/lldb/test/load_unload/d.c b/lldb/test/functionalities/load_unload/d.c
index af5725cb406..af5725cb406 100644
--- a/lldb/test/load_unload/d.c
+++ b/lldb/test/functionalities/load_unload/d.c
diff --git a/lldb/test/load_unload/main.c b/lldb/test/functionalities/load_unload/main.c
index da44abfa0c2..da44abfa0c2 100644
--- a/lldb/test/load_unload/main.c
+++ b/lldb/test/functionalities/load_unload/main.c