From 17b776263f034e4acd0b5038f64a4a88b104a720 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 25 Jun 2012 20:43:40 +0000 Subject: [PATCH] * 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. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/gdb.pascal/floats.exp | 13 +++++-------- gdb/testsuite/gdb.pascal/gdb11492.exp | 12 ++++-------- gdb/testsuite/gdb.pascal/hello.exp | 9 ++------- gdb/testsuite/gdb.pascal/integers.exp | 9 ++------- 5 files changed, 20 insertions(+), 30 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 2d75a1a41d3..90f9bb3d3c2 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2012-06-25 Tom Tromey + + * 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 * 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 e7122e7d0f9..1bde7fa7e91 100644 --- 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 48f7b47db3d..d232ddc2c09 100644 --- 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 0329acbb1c6..cd0fce6e3d0 100644 --- 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 68b978b16bf..82ce0656791 100644 --- 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"] -- 2.30.2