22 files changed, 14 insertions, 14 deletions
diff --git a/lldb/test/abbreviation_tests/Makefile b/lldb/test/functionalities/abbreviation_tests/Makefile
index d4bc9c68904..8a7102e347a 100644
--- a/lldb/test/abbreviation_tests/Makefile
+++ b/lldb/test/functionalities/abbreviation_tests/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
 
 CXX_SOURCES := main.cpp
 
diff --git a/lldb/test/abbreviation_tests/TestAbbreviations.py b/lldb/test/functionalities/abbreviation_tests/TestAbbreviations.py
index 1f718e9ca85..9b9f04e8501 100644
--- a/lldb/test/abbreviation_tests/TestAbbreviations.py
+++ b/lldb/test/functionalities/abbreviation_tests/TestAbbreviations.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class AbbreviationsTestCase(TestBase):
     
-    mydir = "abbreviation_tests"
+    mydir = os.path.join("functionalities", "abbreviation_tests")
 
     def test_nonrunning_command_abbreviations (self):
         self.expect("ap script",
diff --git a/lldb/test/abbreviation_tests/change_prompt.lldb b/lldb/test/functionalities/abbreviation_tests/change_prompt.lldb
index 3342a2a78c7..3342a2a78c7 100644
--- a/lldb/test/abbreviation_tests/change_prompt.lldb
+++ b/lldb/test/functionalities/abbreviation_tests/change_prompt.lldb
diff --git a/lldb/test/abbreviation_tests/main.cpp b/lldb/test/functionalities/abbreviation_tests/main.cpp
index 7af4e3de2d0..7af4e3de2d0 100644
--- a/lldb/test/abbreviation_tests/main.cpp
+++ b/lldb/test/functionalities/abbreviation_tests/main.cpp
diff --git a/lldb/test/alias_tests/Makefile b/lldb/test/functionalities/alias_tests/Makefile
index d4bc9c68904..8a7102e347a 100644
--- a/lldb/test/alias_tests/Makefile
+++ b/lldb/test/functionalities/alias_tests/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
 
 CXX_SOURCES := main.cpp
 
diff --git a/lldb/test/alias_tests/TestAliases.py b/lldb/test/functionalities/alias_tests/TestAliases.py
index ae79875ac41..5c5e1d4d425 100644
--- a/lldb/test/alias_tests/TestAliases.py
+++ b/lldb/test/functionalities/alias_tests/TestAliases.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class AliasTestCase(TestBase):
 
-    mydir = "alias_tests"
+    mydir = os.path.join("functionalities", "alias_tests")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym (self):
diff --git a/lldb/test/alias_tests/main.cpp b/lldb/test/functionalities/alias_tests/main.cpp
index 7af4e3de2d0..7af4e3de2d0 100644
--- a/lldb/test/alias_tests/main.cpp
+++ b/lldb/test/functionalities/alias_tests/main.cpp
diff --git a/lldb/test/breakpoint_ignore_count/Makefile b/lldb/test/functionalities/breakpoint/breakpoint_command/Makefile
index d6cd0db0506..b09a579159d 100644
--- a/lldb/test/breakpoint_ignore_count/Makefile
+++ b/lldb/test/functionalities/breakpoint/breakpoint_command/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/breakpoint_command/TestBreakpointCommand.py b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
index 175c432c06d..fc393892504 100644
--- a/lldb/test/breakpoint_command/TestBreakpointCommand.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class BreakpointCommandTestCase(TestBase):
 
-    mydir = "breakpoint_command"
+    mydir = os.path.join("functionalities", "breakpoint", "breakpoint_command")
 
     @classmethod
     def classCleanup(cls):
diff --git a/lldb/test/breakpoint_command/main.c b/lldb/test/functionalities/breakpoint/breakpoint_command/main.c
index 62ec97f4328..62ec97f4328 100644
--- a/lldb/test/breakpoint_command/main.c
+++ b/lldb/test/functionalities/breakpoint/breakpoint_command/main.c
diff --git a/lldb/test/breakpoint_locations/Makefile b/lldb/test/functionalities/breakpoint/breakpoint_conditions/Makefile
index d6cd0db0506..b09a579159d 100644
--- a/lldb/test/breakpoint_locations/Makefile
+++ b/lldb/test/functionalities/breakpoint/breakpoint_conditions/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/breakpoint_conditions/TestBreakpointConditions.py b/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
index 3c9d06c54cd..b9223197892 100644
--- a/lldb/test/breakpoint_conditions/TestBreakpointConditions.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
@@ -10,7 +10,7 @@ from lldbtest import *
 
 class BreakpointConditionsTestCase(TestBase):
 
-    mydir = "breakpoint_conditions"
+    mydir = os.path.join("functionalities", "breakpoint", "breakpoint_conditions")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/breakpoint_conditions/main.c b/lldb/test/functionalities/breakpoint/breakpoint_conditions/main.c
index dcedf62ae3c..dcedf62ae3c 100644
--- a/lldb/test/breakpoint_conditions/main.c
+++ b/lldb/test/functionalities/breakpoint/breakpoint_conditions/main.c
diff --git a/lldb/test/breakpoint_ids/Makefile b/lldb/test/functionalities/breakpoint/breakpoint_ids/Makefile
index d4bc9c68904..314f1cb2f07 100644
--- a/lldb/test/breakpoint_ids/Makefile
+++ b/lldb/test/functionalities/breakpoint/breakpoint_ids/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 CXX_SOURCES := main.cpp
 
diff --git a/lldb/test/breakpoint_ids/TestBreakpointIDs.py b/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
index 4713479ae38..baa30597c56 100644
--- a/lldb/test/breakpoint_ids/TestBreakpointIDs.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class BreakpointIDTestCase(TestBase):
 
-    mydir = "breakpoint_ids"
+    mydir = os.path.join("functionalities", "breakpoint", "breakpoint_ids")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym (self):
diff --git a/lldb/test/breakpoint_ids/main.cpp b/lldb/test/functionalities/breakpoint/breakpoint_ids/main.cpp
index 3deef22c93c..3deef22c93c 100644
--- a/lldb/test/breakpoint_ids/main.cpp
+++ b/lldb/test/functionalities/breakpoint/breakpoint_ids/main.cpp
diff --git a/lldb/test/breakpoint_command/Makefile b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/Makefile
index d6cd0db0506..b09a579159d 100644
--- a/lldb/test/breakpoint_command/Makefile
+++ b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
index a4bedcb6397..dc6d02b1227 100644
--- a/lldb/test/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
@@ -10,7 +10,7 @@ from lldbtest import *
 
 class BreakpointIgnoreCountTestCase(TestBase):
 
-    mydir = "breakpoint_ignore_count"
+    mydir = os.path.join("functionalities", "breakpoint", "breakpoint_ignore_count")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/breakpoint_ignore_count/main.c b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/main.c
index 0e3773b2da0..0e3773b2da0 100644
--- a/lldb/test/breakpoint_ignore_count/main.c
+++ b/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/main.c
diff --git a/lldb/test/breakpoint_conditions/Makefile b/lldb/test/functionalities/breakpoint/breakpoint_locations/Makefile
index d6cd0db0506..b09a579159d 100644
--- a/lldb/test/breakpoint_conditions/Makefile
+++ b/lldb/test/functionalities/breakpoint/breakpoint_locations/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/breakpoint_locations/TestBreakpointLocations.py b/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
index 335af66162c..a973c5486c6 100644
--- a/lldb/test/breakpoint_locations/TestBreakpointLocations.py
+++ b/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class BreakpointLocationsTestCase(TestBase):
 
-    mydir = "breakpoint_locations"
+    mydir = os.path.join("functionalities", "breakpoint", "breakpoint_locations")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
diff --git a/lldb/test/breakpoint_locations/main.c b/lldb/test/functionalities/breakpoint/breakpoint_locations/main.c
index 7ec3ded67b7..7ec3ded67b7 100644
--- a/lldb/test/breakpoint_locations/main.c
+++ b/lldb/test/functionalities/breakpoint/breakpoint_locations/main.c