diff options
| author | Tom Tromey <tromey@redhat.com> | 2012-06-26 17:32:44 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2012-06-26 17:32:44 +0000 |
| commit | 481fc10041dc81c3664cfc67083504e35e31b289 (patch) | |
| tree | 95967cf539e3d52927fbe2c606ffd0a2d1d75f43 /gdb/testsuite | |
| parent | 6fea9e186c3da74c8f0ba9d007522a7575d24a73 (diff) | |
| download | gdb-481fc10041dc81c3664cfc67083504e35e31b289.zip gdb-481fc10041dc81c3664cfc67083504e35e31b289.tar.gz gdb-481fc10041dc81c3664cfc67083504e35e31b289.tar.bz2 | |
* gdb.stabs/weird.exp: Remove directory-checking code. Use
standard_output_file.
* gdb.stabs/exclfwd.exp: Use standard_testfile,
prepare_for_testing. Remove directory-checking code.
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.stabs/exclfwd.exp | 27 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.stabs/weird.exp | 10 |
3 files changed, 13 insertions, 31 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 86c351c..4dfa7c2 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2012-06-26 Tom Tromey <tromey@redhat.com> + + * gdb.stabs/weird.exp: Remove directory-checking code. Use + standard_output_file. + * gdb.stabs/exclfwd.exp: Use standard_testfile, + prepare_for_testing. Remove directory-checking code. + 2012-06-25 Tom Tromey <tromey@redhat.com> * gdb.multi/watchpoint-multi.exp: Use standard_testfile. diff --git a/gdb/testsuite/gdb.stabs/exclfwd.exp b/gdb/testsuite/gdb.stabs/exclfwd.exp index 8e81440..77e2d5d 100644 --- a/gdb/testsuite/gdb.stabs/exclfwd.exp +++ b/gdb/testsuite/gdb.stabs/exclfwd.exp @@ -16,36 +16,17 @@ # Please email any bugs, comments, and/or additions to this file to: # bug-gdb@gnu.org -# If the test directory was not created by configure then skip -# this test. -if ![file isdirectory ${objdir}/${subdir}] then { - return 0 -} - # # test running programs # -set testfile exclfwd -set binfile ${objdir}/${subdir}/${testfile} +standard_testfile exclfwd1.c exclfwd2.c -foreach file {exclfwd1 exclfwd2} { - if {[gdb_compile "${srcdir}/${subdir}/${file}.c" "${file}.o" object {debug}] != ""} { - untested exclfwd.exp - return -1 - } +if {[prepare_for_testing $testfile.exp $testfile \ + [list $srcfile $srcfile2] debug]} { + return -1 } -if {[gdb_compile "exclfwd1.o exclfwd2.o" ${binfile} executable {debug}] != "" } { - untested exclfwd.exp - return -1 -} - -gdb_exit -gdb_start -gdb_reinitialize_dir $srcdir/$subdir -gdb_load ${binfile} - if ![runto_main] then { perror "couldn't run to breakpoint" continue diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp index 6289844..78ceb68 100644 --- a/gdb/testsuite/gdb.stabs/weird.exp +++ b/gdb/testsuite/gdb.stabs/weird.exp @@ -17,16 +17,10 @@ # Test that GDB properly ignores invalid stabs. # Also test that GDB can debug a .o file, and that it doesn't mind # a file that's more minimal than what a compiler normally puts out. -# If the test directory was not created by configure then skip -# this test. -if ![file isdirectory ${objdir}/${subdir}] then { - return 0 -} - set testfile weird -set srcfile ${objdir}/${subdir}/weird.s -set binfile ${objdir}/${subdir}/weirdx.o +set srcfile [standard_output_file weird.s] +set binfile [standard_output_file weirdx.o] if { [ get_compiler_info ] } { return -1 |