For PR1319: Upgrade to new test harness.

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

5 files changed, 22 insertions, 18 deletions

diff --git a/test/DebugInfo/2006-11-06-StackTrace.cpp b/test/DebugInfo/2006-11-06-StackTrace.cpp
index 9d7c63afc6..e268c207f5 100644
--- a/test/DebugInfo/2006-11-06-StackTrace.cpp
+++ b/test/DebugInfo/2006-11-06-StackTrace.cpp
@@ -1,11 +1,13 @@
 // This is a regression test on debug info to make sure that we can get a
 // meaningful stack trace from a C++ program.
-// RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | llc --disable-fp-elim -o Output/StackTrace.s -f
-// RUN: as Output/StackTrace.s -o Output/StackTrace.o
-// RUN: g++ Output/StackTrace.o -o Output/StackTrace.exe
-// RUN: ( echo "break DeepStack::deepest"; echo "run 17" ; echo "where" ) > Output/StackTrace.gdbin 
-// RUN: gdb -q -batch -n -x Output/StackTrace.gdbin Output/StackTrace.exe | tee Output/StackTrace.out | grep '#0  DeepStack::deepest.*(this=.*,.*x=33)'
-// RUN: gdb -q -batch -n -x Output/StackTrace.gdbin Output/StackTrace.exe | grep '#7  0x.* in main.*(argc=[12],.*argv=.*)'
+// RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | llc --disable-fp-elim -o %t.s -f
+// RUN: as %t.s -o %t.o
+// RUN: %link %t.o -o %t.exe
+// RUN: echo {break DeepStack::deepest\nrun 17\nwhere\n} > %t.in 
+// RUN: gdb -q -batch -n -x %t.in %t.exe | tee %t.out | \
+// RUN:   grep {#0  DeepStack::deepest.*(this=.*,.*x=33)}
+// RUN: gdb -q -batch -n -x %t.in %t.exe | \
+// RUN:   grep {#7  0x.* in main.*(argc=\[12\],.*argv=.*)}
 // XFAIL: i[1-9]86|alpha|ia64|arm|x86_64
 
 #include <stdlib.h>
diff --git a/test/DebugInfo/2006-11-20-GlobalSymbols.cpp b/test/DebugInfo/2006-11-20-GlobalSymbols.cpp
index 8f995df4f7..fc896b330a 100644
--- a/test/DebugInfo/2006-11-20-GlobalSymbols.cpp
+++ b/test/DebugInfo/2006-11-20-GlobalSymbols.cpp
@@ -1,9 +1,8 @@
+// PR1013
 // Check to make sure debug symbols use the correct name for globals and
 // functions.  Will not assemble if it fails to.
 // RUN: %llvmgcc -O0 -g -c %s
 
-// PR1013
-
 int foo __asm__("f\001oo");
 
 int bar() {
diff --git a/test/DebugInfo/2006-11-30-NoCompileUnit.cpp b/test/DebugInfo/2006-11-30-NoCompileUnit.cpp
index 3c5cb34733..993ceb484c 100644
--- a/test/DebugInfo/2006-11-30-NoCompileUnit.cpp
+++ b/test/DebugInfo/2006-11-30-NoCompileUnit.cpp
@@ -1,10 +1,12 @@
 // This is a regression test on debug info to make sure we don't hit a compile 
 // unit size issue with gdb.
-// RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | llc --disable-fp-elim -o Output/NoCompileUnit.s -f
+// RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | \
+// RUN:   llc --disable-fp-elim -o Output/NoCompileUnit.s -f
 // RUN: as Output/NoCompileUnit.s -o Output/NoCompileUnit.o
 // RUN: g++ Output/NoCompileUnit.o -o Output/NoCompileUnit.exe
-// RUN: ( echo "break main"; echo "run" ; echo "p NoCompileUnit::pubname" ) > Output/NoCompileUnit.gdbin 
-// RUN: gdb -q -batch -n -x Output/NoCompileUnit.gdbin Output/NoCompileUnit.exe | tee Output/NoCompileUnit.out | not grep '"low == high"'
+// RUN: echo {break main\nrun\np NoCompileUnit::pubname} > %t2
+// RUN: gdb -q -batch -n -x %t2 Output/NoCompileUnit.exe | \
+// RUN:   tee Output/NoCompileUnit.out | not grep {"low == high"}
 // XFAIL: alpha|ia64|arm
 
 
diff --git a/test/DebugInfo/2006-11-30-Pubnames.cpp b/test/DebugInfo/2006-11-30-Pubnames.cpp
index 4b9376e0a8..698f30bc05 100644
--- a/test/DebugInfo/2006-11-30-Pubnames.cpp
+++ b/test/DebugInfo/2006-11-30-Pubnames.cpp
@@ -1,10 +1,11 @@
 // This is a regression test on debug info to make sure that we can access 
 // qualified global names.
-// RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | llc --disable-fp-elim -o Output/Pubnames.s -f
-// RUN: as Output/Pubnames.s -o Output/Pubnames.o
-// RUN: g++ Output/Pubnames.o -o Output/Pubnames.exe
-// RUN: ( echo "break main"; echo "run" ; echo "p Pubnames::pubname" ) > Output/Pubnames.gdbin 
-// RUN: gdb -q -batch -n -x Output/Pubnames.gdbin Output/Pubnames.exe | tee Output/Pubnames.out | grep '10'
+// RUN: %llvmgcc -S -O0 -g %s -o - | llvm-as | \
+// RUN:   llc --disable-fp-elim -o %t.s -f
+// RUN: as %t.s -o %t.o
+// RUN: %link %t.o -o %t.exe
+// RUN: echo {break main\nrun\np Pubnames::pubname} > %t.in
+// RUN: gdb -q -batch -n -x %t.in %t.exe | tee %t.out | grep {\$1 = 10}
 // XFAIL: alpha|ia64|arm
 
 struct Pubnames {
diff --git a/test/DebugInfo/dg.exp b/test/DebugInfo/dg.exp
index ff34508c3c..879685ca87 100644
--- a/test/DebugInfo/dg.exp
+++ b/test/DebugInfo/dg.exp
@@ -1,3 +1,3 @@
-load_lib llvm-dg.exp
+load_lib llvm.exp
 
-llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]
+RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]]