Replace all instances of dg.exp file with lit.local.cfg, since all tests are run with LIT now and now Dejagnu. dg.exp is no longer needed.

Patch reviewed by Daniel Dunbar. It will be followed by additional cleanup patches.

llvm-svn: 150664

108 files changed, 101 insertions, 168 deletions

diff --git a/llvm/test/Transforms/ADCE/dg.exp b/llvm/test/Transforms/ADCE/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/ADCE/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/ADCE/lit.local.cfg b/llvm/test/Transforms/ADCE/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/ADCE/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/ArgumentPromotion/dg.exp b/llvm/test/Transforms/ArgumentPromotion/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/ArgumentPromotion/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/ArgumentPromotion/lit.local.cfg b/llvm/test/Transforms/ArgumentPromotion/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/ArgumentPromotion/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/BBVectorize/dg.exp b/llvm/test/Transforms/BBVectorize/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/BBVectorize/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/BBVectorize/lit.local.cfg b/llvm/test/Transforms/BBVectorize/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/BBVectorize/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/BlockPlacement/dg.exp b/llvm/test/Transforms/BlockPlacement/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/BlockPlacement/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/BlockPlacement/lit.local.cfg b/llvm/test/Transforms/BlockPlacement/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/BlockPlacement/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/CodeExtractor/dg.exp b/llvm/test/Transforms/CodeExtractor/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/CodeExtractor/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/CodeExtractor/lit.local.cfg b/llvm/test/Transforms/CodeExtractor/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/CodeExtractor/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/CodeGenPrepare/dg.exp b/llvm/test/Transforms/CodeGenPrepare/dg.exp
deleted file mode 100644
index de42dad163f..00000000000
--- a/llvm/test/Transforms/CodeGenPrepare/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.ll]]
diff --git a/llvm/test/Transforms/CodeGenPrepare/lit.local.cfg b/llvm/test/Transforms/CodeGenPrepare/lit.local.cfg
new file mode 100644
index 00000000000..c6106e4746f
--- /dev/null
+++ b/llvm/test/Transforms/CodeGenPrepare/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll']
diff --git a/llvm/test/Transforms/ConstProp/dg.exp b/llvm/test/Transforms/ConstProp/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/ConstProp/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/ConstProp/lit.local.cfg b/llvm/test/Transforms/ConstProp/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/ConstProp/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/ConstantMerge/dg.exp b/llvm/test/Transforms/ConstantMerge/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/ConstantMerge/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/ConstantMerge/lit.local.cfg b/llvm/test/Transforms/ConstantMerge/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/ConstantMerge/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/CorrelatedValuePropagation/dg.exp b/llvm/test/Transforms/CorrelatedValuePropagation/dg.exp
deleted file mode 100644
index de42dad163f..00000000000
--- a/llvm/test/Transforms/CorrelatedValuePropagation/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.ll]]
diff --git a/llvm/test/Transforms/CorrelatedValuePropagation/lit.local.cfg b/llvm/test/Transforms/CorrelatedValuePropagation/lit.local.cfg
new file mode 100644
index 00000000000..c6106e4746f
--- /dev/null
+++ b/llvm/test/Transforms/CorrelatedValuePropagation/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll']
diff --git a/llvm/test/Transforms/DeadArgElim/dg.exp b/llvm/test/Transforms/DeadArgElim/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/DeadArgElim/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/DeadArgElim/lit.local.cfg b/llvm/test/Transforms/DeadArgElim/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/DeadArgElim/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/DeadStoreElimination/dg.exp b/llvm/test/Transforms/DeadStoreElimination/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/DeadStoreElimination/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/DeadStoreElimination/lit.local.cfg b/llvm/test/Transforms/DeadStoreElimination/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/DeadStoreElimination/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/EarlyCSE/dg.exp b/llvm/test/Transforms/EarlyCSE/dg.exp
deleted file mode 100644
index de42dad163f..00000000000
--- a/llvm/test/Transforms/EarlyCSE/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.ll]]
diff --git a/llvm/test/Transforms/EarlyCSE/lit.local.cfg b/llvm/test/Transforms/EarlyCSE/lit.local.cfg
new file mode 100644
index 00000000000..c6106e4746f
--- /dev/null
+++ b/llvm/test/Transforms/EarlyCSE/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll']
diff --git a/llvm/test/Transforms/FunctionAttrs/dg.exp b/llvm/test/Transforms/FunctionAttrs/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/FunctionAttrs/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/FunctionAttrs/lit.local.cfg b/llvm/test/Transforms/FunctionAttrs/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/FunctionAttrs/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/GVN/dg.exp b/llvm/test/Transforms/GVN/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/GVN/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/GVN/lit.local.cfg b/llvm/test/Transforms/GVN/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/GVN/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/GlobalDCE/dg.exp b/llvm/test/Transforms/GlobalDCE/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/GlobalDCE/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/GlobalDCE/lit.local.cfg b/llvm/test/Transforms/GlobalDCE/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/GlobalDCE/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/GlobalOpt/dg.exp b/llvm/test/Transforms/GlobalOpt/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/GlobalOpt/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/GlobalOpt/lit.local.cfg b/llvm/test/Transforms/GlobalOpt/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/GlobalOpt/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/IPConstantProp/dg.exp b/llvm/test/Transforms/IPConstantProp/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/IPConstantProp/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/IPConstantProp/lit.local.cfg b/llvm/test/Transforms/IPConstantProp/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/IPConstantProp/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/IndVarSimplify/dg.exp b/llvm/test/Transforms/IndVarSimplify/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/IndVarSimplify/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/IndVarSimplify/lit.local.cfg b/llvm/test/Transforms/IndVarSimplify/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/IndVarSimplify/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/Inline/dg.exp b/llvm/test/Transforms/Inline/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/Inline/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/Inline/lit.local.cfg b/llvm/test/Transforms/Inline/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/Inline/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/InstCombine/dg.exp b/llvm/test/Transforms/InstCombine/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/InstCombine/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/InstCombine/lit.local.cfg b/llvm/test/Transforms/InstCombine/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/InstCombine/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/InstSimplify/dg.exp b/llvm/test/Transforms/InstSimplify/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/InstSimplify/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/InstSimplify/lit.local.cfg b/llvm/test/Transforms/InstSimplify/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/InstSimplify/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/Internalize/dg.exp b/llvm/test/Transforms/Internalize/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/Internalize/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/Internalize/lit.local.cfg b/llvm/test/Transforms/Internalize/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/Internalize/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/JumpThreading/dg.exp b/llvm/test/Transforms/JumpThreading/dg.exp
deleted file mode 100644
index de42dad163f..00000000000
--- a/llvm/test/Transforms/JumpThreading/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.ll]]
diff --git a/llvm/test/Transforms/JumpThreading/lit.local.cfg b/llvm/test/Transforms/JumpThreading/lit.local.cfg
new file mode 100644
index 00000000000..c6106e4746f
--- /dev/null
+++ b/llvm/test/Transforms/JumpThreading/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll']
diff --git a/llvm/test/Transforms/LCSSA/dg.exp b/llvm/test/Transforms/LCSSA/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/LCSSA/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/LCSSA/lit.local.cfg b/llvm/test/Transforms/LCSSA/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/LCSSA/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/LICM/dg.exp b/llvm/test/Transforms/LICM/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/LICM/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/LICM/lit.local.cfg b/llvm/test/Transforms/LICM/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/LICM/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/LoopDeletion/dg.exp b/llvm/test/Transforms/LoopDeletion/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/LoopDeletion/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/LoopDeletion/lit.local.cfg b/llvm/test/Transforms/LoopDeletion/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/LoopDeletion/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/LoopIdiom/dg.exp b/llvm/test/Transforms/LoopIdiom/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/LoopIdiom/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/LoopIdiom/lit.local.cfg b/llvm/test/Transforms/LoopIdiom/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/LoopIdiom/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/LoopRotate/dg.exp b/llvm/test/Transforms/LoopRotate/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/LoopRotate/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/LoopRotate/lit.local.cfg b/llvm/test/Transforms/LoopRotate/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/LoopRotate/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/LoopSimplify/dg.exp b/llvm/test/Transforms/LoopSimplify/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/LoopSimplify/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/LoopSimplify/lit.local.cfg b/llvm/test/Transforms/LoopSimplify/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/LoopSimplify/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/LoopStrengthReduce/ARM/dg.exp b/llvm/test/Transforms/LoopStrengthReduce/ARM/dg.exp
deleted file mode 100644
index a0009b86e5b..00000000000
--- a/llvm/test/Transforms/LoopStrengthReduce/ARM/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target ARM] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]]
-}
diff --git a/llvm/test/Transforms/LoopStrengthReduce/ARM/lit.local.cfg b/llvm/test/Transforms/LoopStrengthReduce/ARM/lit.local.cfg
new file mode 100644
index 00000000000..d622529cad1
--- /dev/null
+++ b/llvm/test/Transforms/LoopStrengthReduce/ARM/lit.local.cfg
@@ -0,0 +1,13 @@
+config.suffixes = ['.ll']
+
+def getRoot(config):
+    if not config.parent:
+        return config
+    return getRoot(config.parent)
+
+root = getRoot(config)
+
+targets = set(root.targets_to_build.split())
+if not 'ARM' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/Transforms/LoopStrengthReduce/X86/dg.exp b/llvm/test/Transforms/LoopStrengthReduce/X86/dg.exp
deleted file mode 100644
index 7b7bd4e7380..00000000000
--- a/llvm/test/Transforms/LoopStrengthReduce/X86/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target X86] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]]
-}
diff --git a/llvm/test/Transforms/LoopStrengthReduce/X86/lit.local.cfg b/llvm/test/Transforms/LoopStrengthReduce/X86/lit.local.cfg
new file mode 100644
index 00000000000..84bd88ca333
--- /dev/null
+++ b/llvm/test/Transforms/LoopStrengthReduce/X86/lit.local.cfg
@@ -0,0 +1,13 @@
+config.suffixes = ['.ll']
+
+def getRoot(config):
+    if not config.parent:
+        return config
+    return getRoot(config.parent)
+
+root = getRoot(config)
+
+targets = set(root.targets_to_build.split())
+if not 'X86' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/Transforms/LoopStrengthReduce/dg.exp b/llvm/test/Transforms/LoopStrengthReduce/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/LoopStrengthReduce/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/LoopStrengthReduce/lit.local.cfg b/llvm/test/Transforms/LoopStrengthReduce/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/LoopStrengthReduce/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/LoopUnroll/dg.exp b/llvm/test/Transforms/LoopUnroll/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/LoopUnroll/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/LoopUnroll/lit.local.cfg b/llvm/test/Transforms/LoopUnroll/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/LoopUnroll/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/LoopUnswitch/dg.exp b/llvm/test/Transforms/LoopUnswitch/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/LoopUnswitch/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/LoopUnswitch/lit.local.cfg b/llvm/test/Transforms/LoopUnswitch/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/LoopUnswitch/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/LowerAtomic/dg.exp b/llvm/test/Transforms/LowerAtomic/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/LowerAtomic/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/LowerAtomic/lit.local.cfg b/llvm/test/Transforms/LowerAtomic/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/LowerAtomic/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/LowerExpectIntrinsic/dg.exp b/llvm/test/Transforms/LowerExpectIntrinsic/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/LowerExpectIntrinsic/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/LowerExpectIntrinsic/lit.local.cfg b/llvm/test/Transforms/LowerExpectIntrinsic/lit.local.cfg
new file mode 100644
index 00000000000..c6106e4746f
--- /dev/null
+++ b/llvm/test/Transforms/LowerExpectIntrinsic/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll']
diff --git a/llvm/test/Transforms/LowerInvoke/dg.exp b/llvm/test/Transforms/LowerInvoke/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/LowerInvoke/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/LowerInvoke/lit.local.cfg b/llvm/test/Transforms/LowerInvoke/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/LowerInvoke/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/LowerSwitch/dg.exp b/llvm/test/Transforms/LowerSwitch/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/LowerSwitch/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/LowerSwitch/lit.local.cfg b/llvm/test/Transforms/LowerSwitch/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/LowerSwitch/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/Mem2Reg/dg.exp b/llvm/test/Transforms/Mem2Reg/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/Mem2Reg/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/Mem2Reg/lit.local.cfg b/llvm/test/Transforms/Mem2Reg/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/Mem2Reg/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/MemCpyOpt/dg.exp b/llvm/test/Transforms/MemCpyOpt/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/MemCpyOpt/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/MemCpyOpt/lit.local.cfg b/llvm/test/Transforms/MemCpyOpt/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/MemCpyOpt/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/MergeFunc/dg.exp b/llvm/test/Transforms/MergeFunc/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/MergeFunc/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/MergeFunc/lit.local.cfg b/llvm/test/Transforms/MergeFunc/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/MergeFunc/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/ObjCARC/dg.exp b/llvm/test/Transforms/ObjCARC/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/ObjCARC/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/ObjCARC/lit.local.cfg b/llvm/test/Transforms/ObjCARC/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/ObjCARC/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/PhaseOrdering/dg.exp b/llvm/test/Transforms/PhaseOrdering/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/PhaseOrdering/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/PhaseOrdering/lit.local.cfg b/llvm/test/Transforms/PhaseOrdering/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/PhaseOrdering/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/PruneEH/dg.exp b/llvm/test/Transforms/PruneEH/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/PruneEH/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/PruneEH/lit.local.cfg b/llvm/test/Transforms/PruneEH/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/PruneEH/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/Reassociate/dg.exp b/llvm/test/Transforms/Reassociate/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/Reassociate/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/Reassociate/lit.local.cfg b/llvm/test/Transforms/Reassociate/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/Reassociate/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/SCCP/dg.exp b/llvm/test/Transforms/SCCP/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/SCCP/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/SCCP/lit.local.cfg b/llvm/test/Transforms/SCCP/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/SCCP/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/ScalarRepl/dg.exp b/llvm/test/Transforms/ScalarRepl/dg.exp
deleted file mode 100644
index 39954d8a498..00000000000
--- a/llvm/test/Transforms/ScalarRepl/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]]
diff --git a/llvm/test/Transforms/ScalarRepl/lit.local.cfg b/llvm/test/Transforms/ScalarRepl/lit.local.cfg
new file mode 100644
index 00000000000..c6106e4746f
--- /dev/null
+++ b/llvm/test/Transforms/ScalarRepl/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll']
diff --git a/llvm/test/Transforms/SimplifyCFG/dg.exp b/llvm/test/Transforms/SimplifyCFG/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/SimplifyCFG/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/SimplifyCFG/lit.local.cfg b/llvm/test/Transforms/SimplifyCFG/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/SimplifyCFG/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/SimplifyLibCalls/dg.exp b/llvm/test/Transforms/SimplifyLibCalls/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/SimplifyLibCalls/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/SimplifyLibCalls/lit.local.cfg b/llvm/test/Transforms/SimplifyLibCalls/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/SimplifyLibCalls/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/Sink/dg.exp b/llvm/test/Transforms/Sink/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/Sink/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/Sink/lit.local.cfg b/llvm/test/Transforms/Sink/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/Sink/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/StripSymbols/dg.exp b/llvm/test/Transforms/StripSymbols/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/StripSymbols/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/StripSymbols/lit.local.cfg b/llvm/test/Transforms/StripSymbols/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/StripSymbols/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/TailCallElim/dg.exp b/llvm/test/Transforms/TailCallElim/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/TailCallElim/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/TailCallElim/lit.local.cfg b/llvm/test/Transforms/TailCallElim/lit.local.cfg
new file mode 100644
index 00000000000..19eebc0ac7a
--- /dev/null
+++ b/llvm/test/Transforms/TailCallElim/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.ll', '.c', '.cpp']
diff --git a/llvm/test/Transforms/TailDup/X86/dg.exp b/llvm/test/Transforms/TailDup/X86/dg.exp
deleted file mode 100644
index 7b7bd4e7380..00000000000
--- a/llvm/test/Transforms/TailDup/X86/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target X86] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]]
-}
diff --git a/llvm/test/Transforms/TailDup/X86/lit.local.cfg b/llvm/test/Transforms/TailDup/X86/lit.local.cfg
new file mode 100644
index 00000000000..84bd88ca333
--- /dev/null
+++ b/llvm/test/Transforms/TailDup/X86/lit.local.cfg
@@ -0,0 +1,13 @@
+config.suffixes = ['.ll']
+
+def getRoot(config):
+    if not config.parent:
+        return config
+    return getRoot(config.parent)
+
+root = getRoot(config)
+
+targets = set(root.targets_to_build.split())
+if not 'X86' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/Transforms/TailDup/dg.exp b/llvm/test/Transforms/TailDup/dg.exp
deleted file mode 100644
index f2005891a59..00000000000
--- a/llvm/test/Transforms/TailDup/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
diff --git a/llvm/test/Transforms/TailDup/lit.local.cfg b/llvm/test/Transforms/TailDup/lit.local.cfg
new file mode 100644
index 00000000000..39c803900e5
--- /dev/null
+++ b/llvm/test/Transforms/TailDup/lit.local.cfg
@@ -0,0 +1,12 @@
+config.suffixes = ['.ll', '.c', '.cpp']
+
+def getRoot(config):
+    if not config.parent:
+        return config
+    return getRoot(config.parent)
+
+root = getRoot(config)
+
+targets = set(root.targets_to_build.split())
+if not 'X86' in targets:
+    config.unsupported = True