17 files changed, 25 insertions, 21 deletions
diff --git a/llvm/test/LLVMC/dash-x.cpp b/llvm/test/LLVMC/C++/dash-x.cpp
index eb2883d699e..faf8b3072a2 100644
--- a/llvm/test/LLVMC/dash-x.cpp
+++ b/llvm/test/LLVMC/C++/dash-x.cpp
@@ -1,5 +1,5 @@
 // Test that we can compile .c files as C++ and vice versa
-// RUN: llvmc -x c++ %s -x c %p/test_data/false.cpp -x lisp -x whatnot -x none %p/test_data/false2.cpp -o %t
+// RUN: llvmc -x c++ %s -x c %p/../test_data/false.cpp -x lisp -x whatnot -x none %p/../test_data/false2.cpp -o %t
 // RUN: ./%t | grep hello
 
 #include <iostream>
diff --git a/llvm/test/LLVMC/C++/dg.exp b/llvm/test/LLVMC/C++/dg.exp
new file mode 100644
index 00000000000..fc852e30acf
--- /dev/null
+++ b/llvm/test/LLVMC/C++/dg.exp
@@ -0,0 +1,5 @@
+load_lib llvm.exp
+
+if [ llvm_gcc_supports c++ ] then {
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
+}
diff --git a/llvm/test/LLVMC/hello.cpp b/llvm/test/LLVMC/C++/hello.cpp
index 27c89d66fa7..27c89d66fa7 100644
--- a/llvm/test/LLVMC/hello.cpp
+++ b/llvm/test/LLVMC/C++/hello.cpp
diff --git a/llvm/test/LLVMC/together.cpp b/llvm/test/LLVMC/C++/together.cpp
index b07250e9d0b..f1320ca6d03 100644
--- a/llvm/test/LLVMC/together.cpp
+++ b/llvm/test/LLVMC/C++/together.cpp
@@ -1,5 +1,5 @@
 // Check that we can compile files of different types together.
-// RUN: llvmc %s %p/test_data/together.c -o %t
+// RUN: llvmc %s %p/../test_data/together.c -o %t
 // RUN: ./%t | grep hello
 
 extern "C" void test();
diff --git a/llvm/test/LLVMC/C/dg.exp b/llvm/test/LLVMC/C/dg.exp
new file mode 100644
index 00000000000..a9be28a63cf
--- /dev/null
+++ b/llvm/test/LLVMC/C/dg.exp
@@ -0,0 +1,5 @@
+load_lib llvm.exp
+
+if [ llvm_gcc_supports c ] then {
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
+}
diff --git a/llvm/test/LLVMC/emit-llvm.c b/llvm/test/LLVMC/C/emit-llvm.c
index 38bbba6f0af..38bbba6f0af 100644
--- a/llvm/test/LLVMC/emit-llvm.c
+++ b/llvm/test/LLVMC/C/emit-llvm.c
diff --git a/llvm/test/LLVMC/hello.c b/llvm/test/LLVMC/C/hello.c
index 1cda9c3a340..1cda9c3a340 100644
--- a/llvm/test/LLVMC/hello.c
+++ b/llvm/test/LLVMC/C/hello.c
diff --git a/llvm/test/LLVMC/include.c b/llvm/test/LLVMC/C/include.c
index 07ae761d2c8..07ae761d2c8 100644
--- a/llvm/test/LLVMC/include.c
+++ b/llvm/test/LLVMC/C/include.c
diff --git a/llvm/test/LLVMC/opt-test.c b/llvm/test/LLVMC/C/opt-test.c
index ed2df52fed7..ed2df52fed7 100644
--- a/llvm/test/LLVMC/opt-test.c
+++ b/llvm/test/LLVMC/C/opt-test.c
diff --git a/llvm/test/LLVMC/sink.c b/llvm/test/LLVMC/C/sink.c
index 3edbf78112e..3edbf78112e 100644
--- a/llvm/test/LLVMC/sink.c
+++ b/llvm/test/LLVMC/C/sink.c
diff --git a/llvm/test/LLVMC/wall.c b/llvm/test/LLVMC/C/wall.c
index 2c72ea69929..2c72ea69929 100644
--- a/llvm/test/LLVMC/wall.c
+++ b/llvm/test/LLVMC/C/wall.c
diff --git a/llvm/test/LLVMC/ObjC++/dg.exp b/llvm/test/LLVMC/ObjC++/dg.exp
new file mode 100644
index 00000000000..41c3db2af09
--- /dev/null
+++ b/llvm/test/LLVMC/ObjC++/dg.exp
@@ -0,0 +1,5 @@
+load_lib llvm.exp
+
+if [ llvm_gcc_supports obj-c++ ] then {
+    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{mm}]]
+}
diff --git a/llvm/test/LLVMC/hello.mm b/llvm/test/LLVMC/ObjC++/hello.mm
index ff82e4af518..ff82e4af518 100644
--- a/llvm/test/LLVMC/hello.mm
+++ b/llvm/test/LLVMC/ObjC++/hello.mm
diff --git a/llvm/test/LLVMC/ObjC/dg.exp b/llvm/test/LLVMC/ObjC/dg.exp
new file mode 100644
index 00000000000..18f73a79787
--- /dev/null
+++ b/llvm/test/LLVMC/ObjC/dg.exp
@@ -0,0 +1,5 @@
+load_lib llvm.exp
+
+if [ llvm_gcc_supports objc ] then {
+    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{m}]]
+}
diff --git a/llvm/test/LLVMC/hello.m b/llvm/test/LLVMC/ObjC/hello.m
index 1cda9c3a340..1cda9c3a340 100644
--- a/llvm/test/LLVMC/hello.m
+++ b/llvm/test/LLVMC/ObjC/hello.m
diff --git a/llvm/test/LLVMC/dg.exp b/llvm/test/LLVMC/dg.exp
new file mode 100644
index 00000000000..f7d275ad8cb
--- /dev/null
+++ b/llvm/test/LLVMC/dg.exp
@@ -0,0 +1,3 @@
+load_lib llvm.exp
+
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{td}]]
diff --git a/llvm/test/LLVMC/llvmc.exp b/llvm/test/LLVMC/llvmc.exp
deleted file mode 100644
index f33e24381d1..00000000000
--- a/llvm/test/LLVMC/llvmc.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-load_lib llvm.exp
-
-if [ llvm_gcc_supports c ] then {
-    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{c}]]
-}
-
-if [ llvm_gcc_supports c++ ] then {
-    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{cpp}]]
-}
-
-if [ llvm_gcc_supports objc ] then {
-    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{m}]]
-}
-
-if [ llvm_gcc_supports obj-c++ ] then {
-    RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{mm}]]
-}
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{td}]]