15 files changed, 9 insertions, 9 deletions
diff --git a/lldb/test/set_values/Makefile b/lldb/test/lang/c/set_values/Makefile
index d6cd0db0506..b09a579159d 100644
--- a/lldb/test/set_values/Makefile
+++ b/lldb/test/lang/c/set_values/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/set_values/TestSetValues.py b/lldb/test/lang/c/set_values/TestSetValues.py
index 1e480f5d4c9..7808b761c95 100644
--- a/lldb/test/set_values/TestSetValues.py
+++ b/lldb/test/lang/c/set_values/TestSetValues.py
@@ -7,7 +7,7 @@ from lldbtest import *
 
 class SetValuesTestCase(TestBase):
 
-    mydir = "set_values"
+    mydir = os.path.join("lang", "c", "set_values")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
diff --git a/lldb/test/set_values/main.c b/lldb/test/lang/c/set_values/main.c
index b7d659e593c..b7d659e593c 100644
--- a/lldb/test/set_values/main.c
+++ b/lldb/test/lang/c/set_values/main.c
diff --git a/lldb/test/stepping/Makefile b/lldb/test/lang/c/stepping/Makefile
index d6cd0db0506..b09a579159d 100644
--- a/lldb/test/stepping/Makefile
+++ b/lldb/test/lang/c/stepping/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/stepping/TestThreadStepping.py b/lldb/test/lang/c/stepping/TestThreadStepping.py
index 7ce526344a0..ee15968bec8 100644
--- a/lldb/test/stepping/TestThreadStepping.py
+++ b/lldb/test/lang/c/stepping/TestThreadStepping.py
@@ -10,7 +10,7 @@ from lldbtest import *
 
 class ThreadSteppingTestCase(TestBase):
 
-    mydir = "stepping"
+    mydir = os.path.join("lang", "c", "stepping")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_step_out_with_dsym_and_run_command(self):
diff --git a/lldb/test/stepping/main.c b/lldb/test/lang/c/stepping/main.c
index ce3baa5fd05..ce3baa5fd05 100644
--- a/lldb/test/stepping/main.c
+++ b/lldb/test/lang/c/stepping/main.c
diff --git a/lldb/test/struct_types/Makefile b/lldb/test/lang/c/struct_types/Makefile
index d6cd0db0506..b09a579159d 100644
--- a/lldb/test/struct_types/Makefile
+++ b/lldb/test/lang/c/struct_types/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 C_SOURCES := main.c
 
diff --git a/lldb/test/struct_types/TestStructTypes.py b/lldb/test/lang/c/struct_types/TestStructTypes.py
index 82b0322ed0b..65efc7f9a95 100644
--- a/lldb/test/struct_types/TestStructTypes.py
+++ b/lldb/test/lang/c/struct_types/TestStructTypes.py
@@ -11,7 +11,7 @@ from lldbtest import *
 
 class StructTypesTestCase(TestBase):
 
-    mydir = "struct_types"
+    mydir = os.path.join("lang", "c", "struct_types")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
diff --git a/lldb/test/struct_types/cmds.txt b/lldb/test/lang/c/struct_types/cmds.txt
index c308a7637fb..c308a7637fb 100644
--- a/lldb/test/struct_types/cmds.txt
+++ b/lldb/test/lang/c/struct_types/cmds.txt
diff --git a/lldb/test/struct_types/main.c b/lldb/test/lang/c/struct_types/main.c
index d521ec7a804..d521ec7a804 100644
--- a/lldb/test/struct_types/main.c
+++ b/lldb/test/lang/c/struct_types/main.c
diff --git a/lldb/test/stl/Makefile b/lldb/test/lang/cpp/stl/Makefile
index ecc9b165590..e32423a28e5 100644
--- a/lldb/test/stl/Makefile
+++ b/lldb/test/lang/cpp/stl/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 CXX_SOURCES := main.cpp
 CFLAGS :=-arch x86_64 -gdwarf-2 -Os
diff --git a/lldb/test/stl/TestSTL.py b/lldb/test/lang/cpp/stl/TestSTL.py
index 89b91acb5be..160e02b8420 100644
--- a/lldb/test/stl/TestSTL.py
+++ b/lldb/test/lang/cpp/stl/TestSTL.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class STLTestCase(TestBase):
 
-    mydir = "stl"
+    mydir = os.path.join("lang", "cpp", "stl")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):
diff --git a/lldb/test/stl/TestStdCXXDisassembly.py b/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py
index bbefae2a5b5..64aba7f3dde 100644
--- a/lldb/test/stl/TestStdCXXDisassembly.py
+++ b/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py
@@ -9,7 +9,7 @@ from lldbtest import *
 
 class StdCXXDisassembleTestCase(TestBase):
 
-    mydir = "stl"
+    mydir = os.path.join("lang", "cpp", "stl")
 
     def setUp(self):
         # Call super's setUp().
diff --git a/lldb/test/stl/cmds.txt b/lldb/test/lang/cpp/stl/cmds.txt
index 9c9c2e3db57..9c9c2e3db57 100644
--- a/lldb/test/stl/cmds.txt
+++ b/lldb/test/lang/cpp/stl/cmds.txt
diff --git a/lldb/test/stl/main.cpp b/lldb/test/lang/cpp/stl/main.cpp
index 0ac0dda9026..0ac0dda9026 100644
--- a/lldb/test/stl/main.cpp
+++ b/lldb/test/lang/cpp/stl/main.cpp