Adding srcdir arg

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@18020 91177308-0d34-0410-b5e6-96231b3b80d8

63 files changed, 63 insertions, 63 deletions

diff --git a/test/Analysis/Andersens/dg.exp b/test/Analysis/Andersens/dg.exp
index 05c044d8ae..e326ea721c 100644
--- a/test/Analysis/Andersens/dg.exp
+++ b/test/Analysis/Andersens/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Analysis/BasicAA/dg.exp b/test/Analysis/BasicAA/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Analysis/DSGraph/dg.exp b/test/Analysis/DSGraph/dg.exp
index 05c044d8ae..e326ea721c 100644
--- a/test/Analysis/DSGraph/dg.exp
+++ b/test/Analysis/DSGraph/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Analysis/Dominators/dg.exp b/test/Analysis/Dominators/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Analysis/GlobalsModRef/dg.exp b/test/Analysis/GlobalsModRef/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Analysis/LoadVN/dg.exp b/test/Analysis/LoadVN/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Analysis/LoopInfo/dg.exp b/test/Analysis/LoopInfo/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Assembler/dg.exp b/test/Assembler/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/BugPoint/dg.exp b/test/BugPoint/dg.exp
index 05c044d8ae..e326ea721c 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,llx,c,cpp,tr}]] $objdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Bytecode/dg.exp b/test/Bytecode/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/C++Frontend/dg.exp b/test/C++Frontend/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/CFrontend/dg.exp b/test/CFrontend/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/CodeGen/CBackend/dg.exp b/test/CodeGen/CBackend/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/CodeGen/Generic/dg.exp b/test/CodeGen/Generic/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/CodeGen/PowerPC/dg.exp b/test/CodeGen/PowerPC/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/CodeGen/SparcV9/dg.exp b/test/CodeGen/SparcV9/dg.exp
index 05c044d8ae..e326ea721c 100644
--- a/test/CodeGen/SparcV9/dg.exp
+++ b/test/CodeGen/SparcV9/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/CodeGen/X86/dg.exp b/test/CodeGen/X86/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Debugger/dg.exp b/test/Debugger/dg.exp
index 05c044d8ae..e326ea721c 100644
--- a/test/Debugger/dg.exp
+++ b/test/Debugger/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/ExecutionEngine/dg.exp b/test/ExecutionEngine/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Feature/dg.exp b/test/Feature/dg.exp
index 2c793ab7f9..34d688e0ba 100644
--- a/test/Feature/dg.exp
+++ b/test/Feature/dg.exp
@@ -1,4 +1,4 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
 
diff --git a/test/Linker/dg.exp b/test/Linker/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Other/dg.exp b/test/Other/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/TableGen/dg.exp b/test/TableGen/dg.exp
index 05c044d8ae..e326ea721c 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/*.{ll,llx,c,cpp,tr}]] $objdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/ADCE/dg.exp b/test/Transforms/ADCE/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/ArgumentPromotion/dg.exp b/test/Transforms/ArgumentPromotion/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/BlockPlacement/dg.exp b/test/Transforms/BlockPlacement/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/BranchCombine/dg.exp b/test/Transforms/BranchCombine/dg.exp
index 05c044d8ae..e326ea721c 100644
--- a/test/Transforms/BranchCombine/dg.exp
+++ b/test/Transforms/BranchCombine/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/CodeExtractor/dg.exp b/test/Transforms/CodeExtractor/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/ConstProp/dg.exp b/test/Transforms/ConstProp/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/ConstantMerge/dg.exp b/test/Transforms/ConstantMerge/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/CorrelatedExprs/dg.exp b/test/Transforms/CorrelatedExprs/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/DSAnalysis/dg.exp b/test/Transforms/DSAnalysis/dg.exp
index 05c044d8ae..e326ea721c 100644
--- a/test/Transforms/DSAnalysis/dg.exp
+++ b/test/Transforms/DSAnalysis/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/DeadArgElim/dg.exp b/test/Transforms/DeadArgElim/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/DeadStoreElimination/dg.exp b/test/Transforms/DeadStoreElimination/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/DecomposeMultiDimRefs/dg.exp b/test/Transforms/DecomposeMultiDimRefs/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/FunctionResolve/dg.exp b/test/Transforms/FunctionResolve/dg.exp
index 05c044d8ae..e326ea721c 100644
--- a/test/Transforms/FunctionResolve/dg.exp
+++ b/test/Transforms/FunctionResolve/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/GCSE/dg.exp b/test/Transforms/GCSE/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/GlobalDCE/dg.exp b/test/Transforms/GlobalDCE/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/GlobalOpt/dg.exp b/test/Transforms/GlobalOpt/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/IPConstantProp/dg.exp b/test/Transforms/IPConstantProp/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/IndVarsSimplify/dg.exp b/test/Transforms/IndVarsSimplify/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/Inline/dg.exp b/test/Transforms/Inline/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/InstCombine/dg.exp b/test/Transforms/InstCombine/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/LICM/dg.exp b/test/Transforms/LICM/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/LevelRaise/dg.exp b/test/Transforms/LevelRaise/dg.exp
index 05c044d8ae..e326ea721c 100644
--- a/test/Transforms/LevelRaise/dg.exp
+++ b/test/Transforms/LevelRaise/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/LoopSimplify/dg.exp b/test/Transforms/LoopSimplify/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/LoopUnroll/dg.exp b/test/Transforms/LoopUnroll/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/LoopUnswitch/dg.exp b/test/Transforms/LoopUnswitch/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/LowerInvoke/dg.exp b/test/Transforms/LowerInvoke/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/LowerSetJmp/dg.exp b/test/Transforms/LowerSetJmp/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/LowerSwitch/dg.exp b/test/Transforms/LowerSwitch/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/Mem2Reg/dg.exp b/test/Transforms/Mem2Reg/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/PRE/dg.exp b/test/Transforms/PRE/dg.exp
index 05c044d8ae..e326ea721c 100644
--- a/test/Transforms/PRE/dg.exp
+++ b/test/Transforms/PRE/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/ProfilePaths/dg.exp b/test/Transforms/ProfilePaths/dg.exp
index 05c044d8ae..e326ea721c 100644
--- a/test/Transforms/ProfilePaths/dg.exp
+++ b/test/Transforms/ProfilePaths/dg.exp
@@ -1,3 +1,3 @@
 load_lib llvm-dg.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/PruneEH/dg.exp b/test/Transforms/PruneEH/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/RaiseAllocations/dg.exp b/test/Transforms/RaiseAllocations/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/Reassociate/dg.exp b/test/Transforms/Reassociate/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/SCCP/dg.exp b/test/Transforms/SCCP/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/ScalarRepl/dg.exp b/test/Transforms/ScalarRepl/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/SimplifyCFG/dg.exp b/test/Transforms/SimplifyCFG/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/TailCallElim/dg.exp b/test/Transforms/TailCallElim/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Transforms/TailDup/dg.exp b/test/Transforms/TailDup/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
diff --git a/test/Verifier/dg.exp b/test/Verifier/dg.exp
index 05c044d8ae..e326ea721c 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 $subdir $target_triplet $llvmgcc $llvmgxx $prcontext
+llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext