* gdb.pascal/integers.exp: Use standard_testfile, clean_restart.

	* gdb.pascal/hello.exp: Use standard_testfile, clean_restart.
	* gdb.pascal/gdb11492.exp: Use standard_testfile, clean_restart.
	* gdb.pascal/floats.exp: Use standard_testfile, clean_restart.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2d75a1a41d33d3b1b8bd8d1c7406890dc3524dde..90f9bb3d3c241505085584c3531085ac7593b669 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-25  Tom Tromey  <tromey@redhat.com>
+
+       * gdb.pascal/integers.exp: Use standard_testfile, clean_restart.
+       * gdb.pascal/hello.exp: Use standard_testfile, clean_restart.
+       * gdb.pascal/gdb11492.exp: Use standard_testfile, clean_restart.
+       * gdb.pascal/floats.exp: Use standard_testfile, clean_restart.
+
 2012-06-25  Tom Tromey  <tromey@redhat.com>
 
        * gdb.linespec/ls-errs.exp: Use standard_testfile.

diff --git a/gdb/testsuite/gdb.pascal/floats.exp b/gdb/testsuite/gdb.pascal/floats.exp
index e7122e7d0f995809eb193e3e40c7fac4631c3216..1bde7fa7e91529f54ea62da585927fb467258545 100644 (file)
--- a/gdb/testsuite/gdb.pascal/floats.exp
+++ b/gdb/testsuite/gdb.pascal/floats.exp
@@ -15,18 +15,15 @@
 
 load_lib "pascal.exp"
 
-set testfile "floats"
-set srcfile ${testfile}.pas
-set binfile ${objdir}/${subdir}/${testfile}$EXEEXT
+standard_testfile .pas
 
 if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return -1
+    untested $testfile.exp
+    return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
+
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
 

diff --git a/gdb/testsuite/gdb.pascal/gdb11492.exp b/gdb/testsuite/gdb.pascal/gdb11492.exp
index 48f7b47db3d467d0bd1e83655dee03863c5153f8..d232ddc2c093f4ac129f4dedcb7f94ecf4834823 100644 (file)
--- a/gdb/testsuite/gdb.pascal/gdb11492.exp
+++ b/gdb/testsuite/gdb.pascal/gdb11492.exp
@@ -15,18 +15,14 @@
 
 load_lib "pascal.exp"
 
-set testfile "gdb11492"
-set srcfile ${testfile}.pas
-set binfile ${objdir}/${subdir}/${testfile}$EXEEXT
+standard_testfile .pas
 
 if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
-  return -1
+    untested $testfile.exp
+    return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 
 if { [gdb_breakpoint ${srcfile}:${bp_location1}] } {

diff --git a/gdb/testsuite/gdb.pascal/hello.exp b/gdb/testsuite/gdb.pascal/hello.exp
index 0329acbb1c61d46a3e216e4e50e25410b19b2f99..cd0fce6e3d010b92de6e01ab3174401a8a4c29a0 100644 (file)
--- a/gdb/testsuite/gdb.pascal/hello.exp
+++ b/gdb/testsuite/gdb.pascal/hello.exp
@@ -15,18 +15,13 @@
 
 load_lib "pascal.exp"
 
-set testfile "hello"
-set srcfile ${testfile}.pas
-set binfile ${objdir}/${subdir}/${testfile}${EXEEXT}
+standard_testfile .pas
 
 if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]
 

diff --git a/gdb/testsuite/gdb.pascal/integers.exp b/gdb/testsuite/gdb.pascal/integers.exp
index 68b978b16bf3e0bd3b871544f44d3d7653596d89..82ce06567918a729cae226dc7307856d4785f7f8 100644 (file)
--- a/gdb/testsuite/gdb.pascal/integers.exp
+++ b/gdb/testsuite/gdb.pascal/integers.exp
@@ -15,18 +15,13 @@
 
 load_lib "pascal.exp"
 
-set testfile "integers"
-set srcfile ${testfile}.pas
-set binfile ${objdir}/${subdir}/${testfile}$EXEEXT
+standard_testfile .pas
 
 if {[gdb_compile_pascal "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug ]] != "" } {
   return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+clean_restart ${testfile}
 set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location2 [gdb_get_line_number "set breakpoint 2 here"]