17 files changed, 9 insertions, 9 deletions
diff --git a/lldb/test/process_launch/Makefile b/lldb/test/functionalities/process_launch/Makefile
index 95bf9faedbc..313da706b4a 100644
--- a/lldb/test/process_launch/Makefile
+++ b/lldb/test/functionalities/process_launch/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
 
 CXX_SOURCES := main.cpp
 #CXX_SOURCES := print-cwd.cpp
diff --git a/lldb/test/process_launch/TestProcessLaunch.py b/lldb/test/functionalities/process_launch/TestProcessLaunch.py
index e548bdc46c9..8135c11698d 100644
--- a/lldb/test/process_launch/TestProcessLaunch.py
+++ b/lldb/test/functionalities/process_launch/TestProcessLaunch.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class ProcessLaunchTestCase(TestBase):
 
-    mydir = "process_launch"
+    mydir = os.path.join("functionalities", "process_launch")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_io_with_dsym (self):
diff --git a/lldb/test/process_launch/input-file.txt b/lldb/test/functionalities/process_launch/input-file.txt
index cc269ba0ff8..cc269ba0ff8 100644
--- a/lldb/test/process_launch/input-file.txt
+++ b/lldb/test/functionalities/process_launch/input-file.txt
diff --git a/lldb/test/process_launch/main.cpp b/lldb/test/functionalities/process_launch/main.cpp
index f2035d55167..f2035d55167 100644
--- a/lldb/test/process_launch/main.cpp
+++ b/lldb/test/functionalities/process_launch/main.cpp
diff --git a/lldb/test/process_launch/print_cwd.cpp b/lldb/test/functionalities/process_launch/print_cwd.cpp
index 2e88e350438..2e88e350438 100644
--- a/lldb/test/process_launch/print_cwd.cpp
+++ b/lldb/test/functionalities/process_launch/print_cwd.cpp
diff --git a/lldb/test/signal/Makefile b/lldb/test/functionalities/signal/Makefile
index d6cd0db0506..0d70f259501 100644
--- a/lldb/test/signal/Makefile
+++ b/lldb/test/functionalities/signal/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/signal/TestSendSignal.py b/lldb/test/functionalities/signal/TestSendSignal.py
index afd0247ec00..d470dff5f5c 100644
--- a/lldb/test/signal/TestSendSignal.py
+++ b/lldb/test/functionalities/signal/TestSendSignal.py
@@ -7,7 +7,7 @@ from lldbtest import *
 
 class SendSignalTestCase(TestBase):
 
-    mydir = "signal"
+    mydir = os.path.join("functionalities", "signal")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/signal/main.c b/lldb/test/functionalities/signal/main.c
index f9e6c501954..f9e6c501954 100644
--- a/lldb/test/signal/main.c
+++ b/lldb/test/functionalities/signal/main.c
diff --git a/lldb/test/stop-hook/Makefile b/lldb/test/functionalities/stop-hook/Makefile
index d4bc9c68904..8a7102e347a 100644
--- a/lldb/test/stop-hook/Makefile
+++ b/lldb/test/functionalities/stop-hook/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
 
 CXX_SOURCES := main.cpp
 
diff --git a/lldb/test/stop-hook/TestStopHookCmd.py b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py
index 78ad38e8459..1e5d48ed4e1 100644
--- a/lldb/test/stop-hook/TestStopHookCmd.py
+++ b/lldb/test/functionalities/stop-hook/TestStopHookCmd.py
@@ -10,7 +10,7 @@ from lldbtest import *
 
 class StopHookCmdTestCase(TestBase):
 
-    mydir = "stop-hook"
+    mydir = os.path.join("functionalities", "stop-hook")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
diff --git a/lldb/test/stop-hook/TestStopHookMechanism.py b/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py
index fbff37f193b..c9639ea0fc8 100644
--- a/lldb/test/stop-hook/TestStopHookMechanism.py
+++ b/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py
@@ -10,7 +10,7 @@ from lldbtest import *
 
 class StopHookMechanismTestCase(TestBase):
 
-    mydir = "stop-hook"
+    mydir = os.path.join("functionalities", "stop-hook")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
diff --git a/lldb/test/stop-hook/main.cpp b/lldb/test/functionalities/stop-hook/main.cpp
index ee68c34feb8..ee68c34feb8 100644
--- a/lldb/test/stop-hook/main.cpp
+++ b/lldb/test/functionalities/stop-hook/main.cpp
diff --git a/lldb/test/target/Makefile b/lldb/test/functionalities/target_command/Makefile
index e4b33e52e32..9117ab9388b 100644
--- a/lldb/test/target/Makefile
+++ b/lldb/test/functionalities/target_command/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
 
 # Example:
 #
diff --git a/lldb/test/target/TestTargetCommand.py b/lldb/test/functionalities/target_command/TestTargetCommand.py
index 59afb12aa3c..eeb11f136b4 100644
--- a/lldb/test/target/TestTargetCommand.py
+++ b/lldb/test/functionalities/target_command/TestTargetCommand.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class targetCommandTestCase(TestBase):
 
-    mydir = "target"
+    mydir = os.path.join("functionalities", "target_command")
 
     def setUp(self):
         # Call super's setUp().
diff --git a/lldb/test/target/a.c b/lldb/test/functionalities/target_command/a.c
index 9d0706a0862..9d0706a0862 100644
--- a/lldb/test/target/a.c
+++ b/lldb/test/functionalities/target_command/a.c
diff --git a/lldb/test/target/b.c b/lldb/test/functionalities/target_command/b.c
index 62ec97f4328..62ec97f4328 100644
--- a/lldb/test/target/b.c
+++ b/lldb/test/functionalities/target_command/b.c
diff --git a/lldb/test/target/c.c b/lldb/test/functionalities/target_command/c.c
index 7c362cc437a..7c362cc437a 100644
--- a/lldb/test/target/c.c
+++ b/lldb/test/functionalities/target_command/c.c