aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/Analysis/Andersens/dg.exp2
-rw-r--r--test/Analysis/BasicAA/dg.exp2
-rw-r--r--test/Analysis/Dominators/dg.exp2
-rw-r--r--test/Analysis/GlobalsModRef/dg.exp2
-rw-r--r--test/Analysis/LoadVN/dg.exp2
-rw-r--r--test/Analysis/LoopInfo/dg.exp2
-rw-r--r--test/Analysis/ScalarEvolution/dg.exp2
-rw-r--r--test/Archive/dg.exp2
-rw-r--r--test/Assembler/dg.exp2
-rw-r--r--test/BugPoint/dg.exp2
-rw-r--r--test/Bytecode/dg.exp2
-rw-r--r--test/C++Frontend/dg.exp2
-rw-r--r--test/CFrontend/dg.exp2
-rw-r--r--test/CodeGen/ARM/dg.exp2
-rw-r--r--test/CodeGen/Alpha/dg.exp2
-rw-r--r--test/CodeGen/CBackend/dg.exp2
-rw-r--r--test/CodeGen/Generic/GC/dg.exp2
-rw-r--r--test/CodeGen/Generic/dg.exp2
-rw-r--r--test/CodeGen/IA64/dg.exp2
-rw-r--r--test/CodeGen/PowerPC/dg.exp2
-rw-r--r--test/CodeGen/SPARC/dg.exp2
-rw-r--r--test/CodeGen/X86/dg.exp2
-rw-r--r--test/DebugInfo/dg.exp2
-rw-r--r--test/ExecutionEngine/dg.exp2
-rw-r--r--test/Feature/dg.exp2
-rw-r--r--test/Integer/dg.exp2
-rw-r--r--test/Linker/dg.exp2
-rw-r--r--test/Other/dg.exp2
-rw-r--r--test/TableGen/dg.exp2
-rw-r--r--test/Transforms/ADCE/dg.exp2
-rw-r--r--test/Transforms/ArgumentPromotion/dg.exp2
-rw-r--r--test/Transforms/BlockPlacement/dg.exp2
-rw-r--r--test/Transforms/CodeExtractor/dg.exp2
-rw-r--r--test/Transforms/CondProp/dg.exp2
-rw-r--r--test/Transforms/ConstProp/dg.exp2
-rw-r--r--test/Transforms/ConstantMerge/dg.exp2
-rw-r--r--test/Transforms/CorrelatedExprs/dg.exp2
-rw-r--r--test/Transforms/DeadArgElim/dg.exp2
-rw-r--r--test/Transforms/DeadStoreElimination/dg.exp2
-rw-r--r--test/Transforms/DecomposeMultiDimRefs/dg.exp2
-rw-r--r--test/Transforms/GCSE/dg.exp2
-rw-r--r--test/Transforms/GlobalDCE/dg.exp2
-rw-r--r--test/Transforms/GlobalOpt/dg.exp2
-rw-r--r--test/Transforms/IPConstantProp/dg.exp2
-rw-r--r--test/Transforms/IndVarsSimplify/dg.exp2
-rw-r--r--test/Transforms/Inline/dg.exp2
-rw-r--r--test/Transforms/InstCombine/dg.exp2
-rw-r--r--test/Transforms/LCSSA/dg.exp2
-rw-r--r--test/Transforms/LICM/dg.exp2
-rw-r--r--test/Transforms/LoopRotate/dg.exp2
-rw-r--r--test/Transforms/LoopSimplify/dg.exp2
-rw-r--r--test/Transforms/LoopStrengthReduce/dg.exp2
-rw-r--r--test/Transforms/LoopUnroll/dg.exp2
-rw-r--r--test/Transforms/LoopUnswitch/dg.exp2
-rw-r--r--test/Transforms/LowerInvoke/dg.exp2
-rw-r--r--test/Transforms/LowerSetJmp/dg.exp2
-rw-r--r--test/Transforms/LowerSwitch/dg.exp2
-rw-r--r--test/Transforms/Mem2Reg/dg.exp2
-rw-r--r--test/Transforms/PredicateSimplifier/dg.exp2
-rw-r--r--test/Transforms/PruneEH/dg.exp2
-rw-r--r--test/Transforms/RaiseAllocations/dg.exp2
-rw-r--r--test/Transforms/Reassociate/dg.exp2
-rw-r--r--test/Transforms/SCCP/dg.exp2
-rw-r--r--test/Transforms/ScalarRepl/dg.exp2
-rw-r--r--test/Transforms/SimplifyCFG/dg.exp2
-rw-r--r--test/Transforms/SimplifyLibCalls/dg.exp2
-rw-r--r--test/Transforms/TailCallElim/dg.exp2
-rw-r--r--test/Transforms/TailDup/dg.exp2
-rw-r--r--test/Verifier/dg.exp2
-rw-r--r--test/lib/llvm-dg.exp13
70 files changed, 78 insertions, 73 deletions
diff --git a/test/Analysis/Andersens/dg.exp b/test/Analysis/Andersens/dg.exp
index ca40776a23..3d90c6809c 100644
--- a/test/Analysis/Andersens/dg.exp
+++ b/test/Analysis/Andersens/dg.exp
@@ -1,4 +1,4 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Analysis/BasicAA/dg.exp b/test/Analysis/BasicAA/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Analysis/BasicAA/dg.exp
+++ b/test/Analysis/BasicAA/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Analysis/Dominators/dg.exp b/test/Analysis/Dominators/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Analysis/Dominators/dg.exp
+++ b/test/Analysis/Dominators/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Analysis/GlobalsModRef/dg.exp b/test/Analysis/GlobalsModRef/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Analysis/GlobalsModRef/dg.exp
+++ b/test/Analysis/GlobalsModRef/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Analysis/LoadVN/dg.exp b/test/Analysis/LoadVN/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Analysis/LoadVN/dg.exp
+++ b/test/Analysis/LoadVN/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Analysis/LoopInfo/dg.exp b/test/Analysis/LoopInfo/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Analysis/LoopInfo/dg.exp
+++ b/test/Analysis/LoopInfo/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Analysis/ScalarEvolution/dg.exp b/test/Analysis/ScalarEvolution/dg.exp
index d708c3f9fc..0abedddac6 100644
--- a/test/Analysis/ScalarEvolution/dg.exp
+++ b/test/Analysis/ScalarEvolution/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.ll]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.ll]]
diff --git a/test/Archive/dg.exp b/test/Archive/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Archive/dg.exp
+++ b/test/Archive/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Assembler/dg.exp b/test/Assembler/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Assembler/dg.exp
+++ b/test/Assembler/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/BugPoint/dg.exp b/test/BugPoint/dg.exp
index d708c3f9fc..e42204058c 100644
--- a/test/BugPoint/dg.exp
+++ b/test/BugPoint/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.ll]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.ll]]
diff --git a/test/Bytecode/dg.exp b/test/Bytecode/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Bytecode/dg.exp
+++ b/test/Bytecode/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/C++Frontend/dg.exp b/test/C++Frontend/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/C++Frontend/dg.exp
+++ b/test/C++Frontend/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/CFrontend/dg.exp b/test/CFrontend/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/CFrontend/dg.exp
+++ b/test/CFrontend/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/CodeGen/ARM/dg.exp b/test/CodeGen/ARM/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/CodeGen/ARM/dg.exp
+++ b/test/CodeGen/ARM/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/CodeGen/Alpha/dg.exp b/test/CodeGen/Alpha/dg.exp
index e109dadd00..e86a9804da 100644
--- a/test/CodeGen/Alpha/dg.exp
+++ b/test/CodeGen/Alpha/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]]
diff --git a/test/CodeGen/CBackend/dg.exp b/test/CodeGen/CBackend/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/CodeGen/CBackend/dg.exp
+++ b/test/CodeGen/CBackend/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/CodeGen/Generic/GC/dg.exp b/test/CodeGen/Generic/GC/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/CodeGen/Generic/GC/dg.exp
+++ b/test/CodeGen/Generic/GC/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/CodeGen/Generic/dg.exp b/test/CodeGen/Generic/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/CodeGen/Generic/dg.exp
+++ b/test/CodeGen/Generic/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/CodeGen/IA64/dg.exp b/test/CodeGen/IA64/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/CodeGen/IA64/dg.exp
+++ b/test/CodeGen/IA64/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/CodeGen/PowerPC/dg.exp b/test/CodeGen/PowerPC/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/CodeGen/PowerPC/dg.exp
+++ b/test/CodeGen/PowerPC/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/CodeGen/SPARC/dg.exp b/test/CodeGen/SPARC/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/CodeGen/SPARC/dg.exp
+++ b/test/CodeGen/SPARC/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/CodeGen/X86/dg.exp b/test/CodeGen/X86/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/CodeGen/X86/dg.exp
+++ b/test/CodeGen/X86/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/DebugInfo/dg.exp b/test/DebugInfo/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/DebugInfo/dg.exp
+++ b/test/DebugInfo/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/ExecutionEngine/dg.exp b/test/ExecutionEngine/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/ExecutionEngine/dg.exp
+++ b/test/ExecutionEngine/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Feature/dg.exp b/test/Feature/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Feature/dg.exp
+++ b/test/Feature/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Integer/dg.exp b/test/Integer/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Integer/dg.exp
+++ b/test/Integer/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Linker/dg.exp b/test/Linker/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Linker/dg.exp
+++ b/test/Linker/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Other/dg.exp b/test/Other/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Other/dg.exp
+++ b/test/Other/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/TableGen/dg.exp b/test/TableGen/dg.exp
index 07d5faad40..83159616d4 100644
--- a/test/TableGen/dg.exp
+++ b/test/TableGen/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{td}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{td}]]
diff --git a/test/Transforms/ADCE/dg.exp b/test/Transforms/ADCE/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/ADCE/dg.exp
+++ b/test/Transforms/ADCE/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/ArgumentPromotion/dg.exp b/test/Transforms/ArgumentPromotion/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/ArgumentPromotion/dg.exp
+++ b/test/Transforms/ArgumentPromotion/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/BlockPlacement/dg.exp b/test/Transforms/BlockPlacement/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/BlockPlacement/dg.exp
+++ b/test/Transforms/BlockPlacement/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/CodeExtractor/dg.exp b/test/Transforms/CodeExtractor/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/CodeExtractor/dg.exp
+++ b/test/Transforms/CodeExtractor/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/CondProp/dg.exp b/test/Transforms/CondProp/dg.exp
index e109dadd00..e86a9804da 100644
--- a/test/Transforms/CondProp/dg.exp
+++ b/test/Transforms/CondProp/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll}]]
diff --git a/test/Transforms/ConstProp/dg.exp b/test/Transforms/ConstProp/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/ConstProp/dg.exp
+++ b/test/Transforms/ConstProp/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/ConstantMerge/dg.exp b/test/Transforms/ConstantMerge/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/ConstantMerge/dg.exp
+++ b/test/Transforms/ConstantMerge/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/CorrelatedExprs/dg.exp b/test/Transforms/CorrelatedExprs/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/CorrelatedExprs/dg.exp
+++ b/test/Transforms/CorrelatedExprs/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/DeadArgElim/dg.exp b/test/Transforms/DeadArgElim/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/DeadArgElim/dg.exp
+++ b/test/Transforms/DeadArgElim/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/DeadStoreElimination/dg.exp b/test/Transforms/DeadStoreElimination/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/DeadStoreElimination/dg.exp
+++ b/test/Transforms/DeadStoreElimination/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/DecomposeMultiDimRefs/dg.exp b/test/Transforms/DecomposeMultiDimRefs/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/DecomposeMultiDimRefs/dg.exp
+++ b/test/Transforms/DecomposeMultiDimRefs/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/GCSE/dg.exp b/test/Transforms/GCSE/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/GCSE/dg.exp
+++ b/test/Transforms/GCSE/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/GlobalDCE/dg.exp b/test/Transforms/GlobalDCE/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/GlobalDCE/dg.exp
+++ b/test/Transforms/GlobalDCE/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/GlobalOpt/dg.exp b/test/Transforms/GlobalOpt/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/GlobalOpt/dg.exp
+++ b/test/Transforms/GlobalOpt/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/IPConstantProp/dg.exp b/test/Transforms/IPConstantProp/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/IPConstantProp/dg.exp
+++ b/test/Transforms/IPConstantProp/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/IndVarsSimplify/dg.exp b/test/Transforms/IndVarsSimplify/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/IndVarsSimplify/dg.exp
+++ b/test/Transforms/IndVarsSimplify/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/Inline/dg.exp b/test/Transforms/Inline/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/Inline/dg.exp
+++ b/test/Transforms/Inline/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/InstCombine/dg.exp b/test/Transforms/InstCombine/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/InstCombine/dg.exp
+++ b/test/Transforms/InstCombine/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/LCSSA/dg.exp b/test/Transforms/LCSSA/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/LCSSA/dg.exp
+++ b/test/Transforms/LCSSA/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/LICM/dg.exp b/test/Transforms/LICM/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/LICM/dg.exp
+++ b/test/Transforms/LICM/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/LoopRotate/dg.exp b/test/Transforms/LoopRotate/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/LoopRotate/dg.exp
+++ b/test/Transforms/LoopRotate/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/LoopSimplify/dg.exp b/test/Transforms/LoopSimplify/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/LoopSimplify/dg.exp
+++ b/test/Transforms/LoopSimplify/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/LoopStrengthReduce/dg.exp b/test/Transforms/LoopStrengthReduce/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/LoopStrengthReduce/dg.exp
+++ b/test/Transforms/LoopStrengthReduce/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/LoopUnroll/dg.exp b/test/Transforms/LoopUnroll/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/LoopUnroll/dg.exp
+++ b/test/Transforms/LoopUnroll/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/LoopUnswitch/dg.exp b/test/Transforms/LoopUnswitch/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/LoopUnswitch/dg.exp
+++ b/test/Transforms/LoopUnswitch/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/LowerInvoke/dg.exp b/test/Transforms/LowerInvoke/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/LowerInvoke/dg.exp
+++ b/test/Transforms/LowerInvoke/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/LowerSetJmp/dg.exp b/test/Transforms/LowerSetJmp/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/LowerSetJmp/dg.exp
+++ b/test/Transforms/LowerSetJmp/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/LowerSwitch/dg.exp b/test/Transforms/LowerSwitch/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/LowerSwitch/dg.exp
+++ b/test/Transforms/LowerSwitch/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/Mem2Reg/dg.exp b/test/Transforms/Mem2Reg/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/Mem2Reg/dg.exp
+++ b/test/Transforms/Mem2Reg/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/PredicateSimplifier/dg.exp b/test/Transforms/PredicateSimplifier/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/PredicateSimplifier/dg.exp
+++ b/test/Transforms/PredicateSimplifier/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/PruneEH/dg.exp b/test/Transforms/PruneEH/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/PruneEH/dg.exp
+++ b/test/Transforms/PruneEH/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/RaiseAllocations/dg.exp b/test/Transforms/RaiseAllocations/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/RaiseAllocations/dg.exp
+++ b/test/Transforms/RaiseAllocations/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/Reassociate/dg.exp b/test/Transforms/Reassociate/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/Reassociate/dg.exp
+++ b/test/Transforms/Reassociate/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/SCCP/dg.exp b/test/Transforms/SCCP/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/SCCP/dg.exp
+++ b/test/Transforms/SCCP/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/ScalarRepl/dg.exp b/test/Transforms/ScalarRepl/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/ScalarRepl/dg.exp
+++ b/test/Transforms/ScalarRepl/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/SimplifyCFG/dg.exp b/test/Transforms/SimplifyCFG/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/SimplifyCFG/dg.exp
+++ b/test/Transforms/SimplifyCFG/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/SimplifyLibCalls/dg.exp b/test/Transforms/SimplifyLibCalls/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/SimplifyLibCalls/dg.exp
+++ b/test/Transforms/SimplifyLibCalls/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/TailCallElim/dg.exp b/test/Transforms/TailCallElim/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/TailCallElim/dg.exp
+++ b/test/Transforms/TailCallElim/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Transforms/TailDup/dg.exp b/test/Transforms/TailDup/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Transforms/TailDup/dg.exp
+++ b/test/Transforms/TailDup/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/Verifier/dg.exp b/test/Verifier/dg.exp
index 142de8a6c8..ff34508c3c 100644
--- a/test/Verifier/dg.exp
+++ b/test/Verifier/dg.exp
@@ -1,3 +1,3 @@
load_lib llvm-dg.exp
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
diff --git a/test/lib/llvm-dg.exp b/test/lib/llvm-dg.exp
index 07dffae29c..593108af4a 100644
--- a/test/lib/llvm-dg.exp
+++ b/test/lib/llvm-dg.exp
@@ -1,5 +1,6 @@
-proc llvm-runtest { programs objdir srcdir subdir target_triplet llvmgcc llvmgxx prcontext llvmgcc_version} {
-
+proc llvm-runtest { programs } {
+ global objdir srcdir subdir target_triplet llvmgcc llvmgxx prcontext
+ global llvmgcc_version srcroot objroot llvmlibsdir
set timeout 60
@@ -63,6 +64,12 @@ proc llvm-runtest { programs objdir srcdir subdir target_triplet llvmgcc llvmgxx
#replace %llvmgxx with actual path to llvmg++
regsub -all {%llvmgxx} $new_runline "$llvmgxx -emit-llvm" new_runline
+ #replace %L with path to libraries
+ regsub -all {%L} $new_runline "$llvmlibsdir" new_runline
+
+ #replace %I with path to includes
+ regsub -all {%I} $new_runline "$srcroot/include" new_runline
+
puts $scriptFileId $new_runline
} elseif {[regexp {XFAIL:[ *](.+)} $line match targets]} {
set targets
@@ -127,5 +134,3 @@ proc llvm-runtest { programs objdir srcdir subdir target_triplet llvmgcc llvmgxx
}
}
}
-
-