14 files changed, 8 insertions, 8 deletions
diff --git a/lldb/test/objc-dynamic-value/Makefile b/lldb/test/lang/objc/objc-dynamic-value/Makefile
index d7c1e6d1bd8..a981f4b9035 100644
--- a/lldb/test/objc-dynamic-value/Makefile
+++ b/lldb/test/lang/objc/objc-dynamic-value/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 OBJC_SOURCES := dynamic-value.m
 LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
diff --git a/lldb/test/objc-dynamic-value/TestObjCDynamicValue.py b/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
index 37d9a06e818..1a5547bccce 100644
--- a/lldb/test/objc-dynamic-value/TestObjCDynamicValue.py
+++ b/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
@@ -10,7 +10,7 @@ from lldbtest import *
 
 class ObjCDynamicValueTestCase(TestBase):
 
-    mydir = "objc-dynamic-value"
+    mydir = os.path.join("lang", "objc", "objc-dynamic-value")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @python_api_test
diff --git a/lldb/test/objc-dynamic-value/dynamic-value.m b/lldb/test/lang/objc/objc-dynamic-value/dynamic-value.m
index 60a506efd8e..60a506efd8e 100644
--- a/lldb/test/objc-dynamic-value/dynamic-value.m
+++ b/lldb/test/lang/objc/objc-dynamic-value/dynamic-value.m
diff --git a/lldb/test/objc-ivar-offsets/Makefile b/lldb/test/lang/objc/objc-ivar-offsets/Makefile
index 8ef38799e12..fdd3b5ebfa9 100644
--- a/lldb/test/objc-ivar-offsets/Makefile
+++ b/lldb/test/lang/objc/objc-ivar-offsets/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 OBJC_SOURCES := objc-ivar-offsets.m main.m
 LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
diff --git a/lldb/test/objc-ivar-offsets/TestObjCIvarOffsets.py b/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
index 60c997924b7..066e9e4f899 100644
--- a/lldb/test/objc-ivar-offsets/TestObjCIvarOffsets.py
+++ b/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
@@ -8,7 +8,7 @@ import lldbutil
 
 class TestObjCIvarOffsets(TestBase):
 
-    mydir = "objc-ivar-offsets"
+    mydir = os.path.join("lang", "objc", "objc-ivar-offsets")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @python_api_test
diff --git a/lldb/test/objc-ivar-offsets/main.m b/lldb/test/lang/objc/objc-ivar-offsets/main.m
index 206255f6a21..206255f6a21 100644
--- a/lldb/test/objc-ivar-offsets/main.m
+++ b/lldb/test/lang/objc/objc-ivar-offsets/main.m
diff --git a/lldb/test/objc-ivar-offsets/objc-ivar-offsets.h b/lldb/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h
index 9dff95e0839..9dff95e0839 100644
--- a/lldb/test/objc-ivar-offsets/objc-ivar-offsets.h
+++ b/lldb/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h
diff --git a/lldb/test/objc-ivar-offsets/objc-ivar-offsets.m b/lldb/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.m
index db87adea3d1..db87adea3d1 100644
--- a/lldb/test/objc-ivar-offsets/objc-ivar-offsets.m
+++ b/lldb/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.m
diff --git a/lldb/test/objc-optimized/Makefile b/lldb/test/lang/objc/objc-optimized/Makefile
index 69563c13b0e..a8cf6b98194 100644
--- a/lldb/test/objc-optimized/Makefile
+++ b/lldb/test/lang/objc/objc-optimized/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 OBJC_SOURCES := main.m
 
diff --git a/lldb/test/objc-optimized/TestObjcOptimized.py b/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py
index e9192c8dd8d..bbdf5854849 100644
--- a/lldb/test/objc-optimized/TestObjcOptimized.py
+++ b/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py
@@ -17,7 +17,7 @@ from lldbtest import *
 @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
 class ObjcOptimizedTestCase(TestBase):
 
-    mydir = "objc-optimized"
+    mydir = os.path.join("lang", "objc", "objc-optimized")
     myclass = "MyClass"
     mymethod = "description"
     method_spec = "-[%s %s]" % (myclass, mymethod)
diff --git a/lldb/test/objc-optimized/main.m b/lldb/test/lang/objc/objc-optimized/main.m
index df88eea0f86..df88eea0f86 100644
--- a/lldb/test/objc-optimized/main.m
+++ b/lldb/test/lang/objc/objc-optimized/main.m
diff --git a/lldb/test/objc-stepping/Makefile b/lldb/test/lang/objc/objc-stepping/Makefile
index 74abbb9de8a..b097fe65fce 100644
--- a/lldb/test/objc-stepping/Makefile
+++ b/lldb/test/lang/objc/objc-stepping/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
 
 OBJC_SOURCES := stepping-tests.m
 LDFLAGS = $(CFLAGS) -lobjc -framework Foundation
diff --git a/lldb/test/objc-stepping/TestObjCStepping.py b/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py
index 27135b0589c..9db97908e71 100644
--- a/lldb/test/objc-stepping/TestObjCStepping.py
+++ b/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py
@@ -7,7 +7,7 @@ from lldbtest import *
 
 class TestObjCStepping(TestBase):
 
-    mydir = "objc-stepping"
+    mydir = os.path.join("lang", "objc", "objc-stepping")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @python_api_test
diff --git a/lldb/test/objc-stepping/stepping-tests.m b/lldb/test/lang/objc/objc-stepping/stepping-tests.m
index cc62dc251ce..cc62dc251ce 100644
--- a/lldb/test/objc-stepping/stepping-tests.m
+++ b/lldb/test/lang/objc/objc-stepping/stepping-tests.m