Move some directories to now reside under lang/c or lang/cpp.
llvm-svn: 133881
diff --git a/lldb/test/class_types/Makefile b/lldb/test/class_types/Makefile
deleted file mode 100644
index d4bc9c6..0000000
--- a/lldb/test/class_types/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../make
-
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/array_types/Makefile b/lldb/test/lang/c/array_types/Makefile
similarity index 71%
rename from lldb/test/array_types/Makefile
rename to lldb/test/lang/c/array_types/Makefile
index d6cd0db..b09a579 100644
--- a/lldb/test/array_types/Makefile
+++ b/lldb/test/lang/c/array_types/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
C_SOURCES := main.c
diff --git a/lldb/test/array_types/TestArrayTypes.py b/lldb/test/lang/c/array_types/TestArrayTypes.py
similarity index 99%
rename from lldb/test/array_types/TestArrayTypes.py
rename to lldb/test/lang/c/array_types/TestArrayTypes.py
index 7d5eea1..81cb65f 100644
--- a/lldb/test/array_types/TestArrayTypes.py
+++ b/lldb/test/lang/c/array_types/TestArrayTypes.py
@@ -7,7 +7,7 @@
class ArrayTypesTestCase(TestBase):
- mydir = "array_types"
+ mydir = os.path.join("lang", "c", "array_types")
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/array_types/cmds.txt b/lldb/test/lang/c/array_types/cmds.txt
similarity index 100%
rename from lldb/test/array_types/cmds.txt
rename to lldb/test/lang/c/array_types/cmds.txt
diff --git a/lldb/test/array_types/main.c b/lldb/test/lang/c/array_types/main.c
similarity index 100%
rename from lldb/test/array_types/main.c
rename to lldb/test/lang/c/array_types/main.c
diff --git a/lldb/test/bitfields/Makefile b/lldb/test/lang/c/bitfields/Makefile
similarity index 71%
rename from lldb/test/bitfields/Makefile
rename to lldb/test/lang/c/bitfields/Makefile
index d6cd0db..b09a579 100644
--- a/lldb/test/bitfields/Makefile
+++ b/lldb/test/lang/c/bitfields/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
C_SOURCES := main.c
diff --git a/lldb/test/bitfields/TestBitfields.py b/lldb/test/lang/c/bitfields/TestBitfields.py
similarity index 98%
rename from lldb/test/bitfields/TestBitfields.py
rename to lldb/test/lang/c/bitfields/TestBitfields.py
index bf8f541..be091cb 100644
--- a/lldb/test/bitfields/TestBitfields.py
+++ b/lldb/test/lang/c/bitfields/TestBitfields.py
@@ -7,7 +7,7 @@
class BitfieldsTestCase(TestBase):
- mydir = "bitfields"
+ mydir = os.path.join("lang", "c", "bitfields")
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/bitfields/main.c b/lldb/test/lang/c/bitfields/main.c
similarity index 100%
rename from lldb/test/bitfields/main.c
rename to lldb/test/lang/c/bitfields/main.c
diff --git a/lldb/test/class_static/Makefile b/lldb/test/lang/cpp/class_static/Makefile
similarity index 72%
rename from lldb/test/class_static/Makefile
rename to lldb/test/lang/cpp/class_static/Makefile
index d4bc9c6..314f1cb 100644
--- a/lldb/test/class_static/Makefile
+++ b/lldb/test/lang/cpp/class_static/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/test/class_static/TestStaticVariables.py b/lldb/test/lang/cpp/class_static/TestStaticVariables.py
similarity index 98%
rename from lldb/test/class_static/TestStaticVariables.py
rename to lldb/test/lang/cpp/class_static/TestStaticVariables.py
index b23eb675..18415b1 100644
--- a/lldb/test/class_static/TestStaticVariables.py
+++ b/lldb/test/lang/cpp/class_static/TestStaticVariables.py
@@ -9,7 +9,7 @@
class StaticVariableTestCase(TestBase):
- mydir = "class_static"
+ mydir = os.path.join("lang", "cpp", "class_static")
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/class_static/main.cpp b/lldb/test/lang/cpp/class_static/main.cpp
similarity index 100%
rename from lldb/test/class_static/main.cpp
rename to lldb/test/lang/cpp/class_static/main.cpp
diff --git a/lldb/test/class_static/Makefile b/lldb/test/lang/cpp/class_types/Makefile
similarity index 72%
copy from lldb/test/class_static/Makefile
copy to lldb/test/lang/cpp/class_types/Makefile
index d4bc9c6..314f1cb 100644
--- a/lldb/test/class_static/Makefile
+++ b/lldb/test/lang/cpp/class_types/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/test/class_types/TestClassTypes.py b/lldb/test/lang/cpp/class_types/TestClassTypes.py
similarity index 99%
rename from lldb/test/class_types/TestClassTypes.py
rename to lldb/test/lang/cpp/class_types/TestClassTypes.py
index 358c32d..657f90d 100644
--- a/lldb/test/class_types/TestClassTypes.py
+++ b/lldb/test/lang/cpp/class_types/TestClassTypes.py
@@ -8,7 +8,7 @@
class ClassTypesTestCase(TestBase):
- mydir = "class_types"
+ mydir = os.path.join("lang", "cpp", "class_types")
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/class_types/TestClassTypesDisassembly.py b/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py
similarity index 98%
rename from lldb/test/class_types/TestClassTypesDisassembly.py
rename to lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py
index 3cb10da..9d88fb2 100644
--- a/lldb/test/class_types/TestClassTypesDisassembly.py
+++ b/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py
@@ -9,7 +9,7 @@
class IterateFrameAndDisassembleTestCase(TestBase):
- mydir = "class_types"
+ mydir = os.path.join("lang", "cpp", "class_types")
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
def test_with_dsym_and_run_command(self):
diff --git a/lldb/test/class_types/cmds.txt b/lldb/test/lang/cpp/class_types/cmds.txt
similarity index 100%
rename from lldb/test/class_types/cmds.txt
rename to lldb/test/lang/cpp/class_types/cmds.txt
diff --git a/lldb/test/class_types/main.cpp b/lldb/test/lang/cpp/class_types/main.cpp
similarity index 100%
rename from lldb/test/class_types/main.cpp
rename to lldb/test/lang/cpp/class_types/main.cpp
diff --git a/lldb/test/class_static/Makefile b/lldb/test/lang/cpp/signed_types/Makefile
similarity index 72%
copy from lldb/test/class_static/Makefile
copy to lldb/test/lang/cpp/signed_types/Makefile
index d4bc9c6..314f1cb 100644
--- a/lldb/test/class_static/Makefile
+++ b/lldb/test/lang/cpp/signed_types/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/test/signed_types/TestSignedTypes.py b/lldb/test/lang/cpp/signed_types/TestSignedTypes.py
similarity index 97%
rename from lldb/test/signed_types/TestSignedTypes.py
rename to lldb/test/lang/cpp/signed_types/TestSignedTypes.py
index 2f7933f..7a3e866 100644
--- a/lldb/test/signed_types/TestSignedTypes.py
+++ b/lldb/test/lang/cpp/signed_types/TestSignedTypes.py
@@ -10,7 +10,7 @@
class UnsignedTypesTestCase(TestBase):
- mydir = "signed_types"
+ mydir = os.path.join("lang", "cpp", "signed_types")
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
def test_with_dsym(self):
diff --git a/lldb/test/signed_types/main.cpp b/lldb/test/lang/cpp/signed_types/main.cpp
similarity index 100%
rename from lldb/test/signed_types/main.cpp
rename to lldb/test/lang/cpp/signed_types/main.cpp
diff --git a/lldb/test/class_static/Makefile b/lldb/test/lang/cpp/unique-types/Makefile
similarity index 72%
copy from lldb/test/class_static/Makefile
copy to lldb/test/lang/cpp/unique-types/Makefile
index d4bc9c6..314f1cb 100644
--- a/lldb/test/class_static/Makefile
+++ b/lldb/test/lang/cpp/unique-types/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/test/unique-types/TestUniqueTypes.py b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py
similarity index 98%
rename from lldb/test/unique-types/TestUniqueTypes.py
rename to lldb/test/lang/cpp/unique-types/TestUniqueTypes.py
index 4d70838..a5a265d 100644
--- a/lldb/test/unique-types/TestUniqueTypes.py
+++ b/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py
@@ -9,7 +9,7 @@
class UniqueTypesTestCase(TestBase):
- mydir = "unique-types"
+ mydir = os.path.join("lang", "cpp", "unique-types")
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
def test_with_dsym(self):
diff --git a/lldb/test/unique-types/main.cpp b/lldb/test/lang/cpp/unique-types/main.cpp
similarity index 100%
rename from lldb/test/unique-types/main.cpp
rename to lldb/test/lang/cpp/unique-types/main.cpp
diff --git a/lldb/test/class_static/Makefile b/lldb/test/lang/cpp/unsigned_types/Makefile
similarity index 72%
copy from lldb/test/class_static/Makefile
copy to lldb/test/lang/cpp/unsigned_types/Makefile
index d4bc9c6..314f1cb 100644
--- a/lldb/test/class_static/Makefile
+++ b/lldb/test/lang/cpp/unsigned_types/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
diff --git a/lldb/test/unsigned_types/TestUnsignedTypes.py b/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
similarity index 97%
rename from lldb/test/unsigned_types/TestUnsignedTypes.py
rename to lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
index e8156b5..b616f46 100644
--- a/lldb/test/unsigned_types/TestUnsignedTypes.py
+++ b/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
@@ -10,7 +10,7 @@
class UnsignedTypesTestCase(TestBase):
- mydir = "unsigned_types"
+ mydir = os.path.join("lang", "cpp", "unsigned_types")
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
def test_with_dsym(self):
diff --git a/lldb/test/unsigned_types/main.cpp b/lldb/test/lang/cpp/unsigned_types/main.cpp
similarity index 100%
rename from lldb/test/unsigned_types/main.cpp
rename to lldb/test/lang/cpp/unsigned_types/main.cpp
diff --git a/lldb/test/signed_types/Makefile b/lldb/test/signed_types/Makefile
deleted file mode 100644
index d4bc9c6..0000000
--- a/lldb/test/signed_types/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../make
-
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/unique-types/Makefile b/lldb/test/unique-types/Makefile
deleted file mode 100644
index d4bc9c6..0000000
--- a/lldb/test/unique-types/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../make
-
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/unsigned_types/Makefile b/lldb/test/unsigned_types/Makefile
deleted file mode 100644
index d4bc9c6..0000000
--- a/lldb/test/unsigned_types/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../make
-
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules