diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.guile/scm-error.exp | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.guile/scm-frame-args.exp | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.guile/scm-section-script.exp | 6 |
4 files changed, 11 insertions, 15 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 279ff40..c389d7d 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2014-12-05 Yao Qi <yao@codesourcery.com> + * gdb.guile/scm-error.exp: Remove the third argument to + gdb_remote_download. + * gdb.guile/scm-frame-args.exp: Likewise. + * gdb.guile/scm-section-script.exp: Likewise. + +2014-12-05 Yao Qi <yao@codesourcery.com> + * gdb.arch/i386-bp_permanent.exp: Use standard_testfile. 2014-12-04 Doug Evans <dje@google.com> diff --git a/gdb/testsuite/gdb.guile/scm-error.exp b/gdb/testsuite/gdb.guile/scm-error.exp index 3de3dc2..8e33adf 100644 --- a/gdb/testsuite/gdb.guile/scm-error.exp +++ b/gdb/testsuite/gdb.guile/scm-error.exp @@ -28,14 +28,10 @@ if { [skip_guile_tests] } { continue } # Test error while loading .scm. -# Give the files a new name so we don't clobber the real one if -# objfile == srcdir. set remote_guile_file_1 [gdb_remote_download host \ - ${srcdir}/${subdir}/${testfile}-1.scm \ - ${subdir}/t-${testfile}-1.scm] + ${srcdir}/${subdir}/${testfile}-1.scm] set remote_guile_file_2 [gdb_remote_download host \ - ${srcdir}/${subdir}/${testfile}-2.scm \ - ${subdir}/t-${testfile}-2.scm] + ${srcdir}/${subdir}/${testfile}-2.scm] gdb_test "source $remote_guile_file_1" \ "(ERROR: )?In procedure \[+\]: Wrong type: #f.*" \ diff --git a/gdb/testsuite/gdb.guile/scm-frame-args.exp b/gdb/testsuite/gdb.guile/scm-frame-args.exp index 22ce6fe..cfdc8ff 100644 --- a/gdb/testsuite/gdb.guile/scm-frame-args.exp +++ b/gdb/testsuite/gdb.guile/scm-frame-args.exp @@ -28,11 +28,8 @@ if ![gdb_guile_runto_main] { return } -# Give the file a new name so we don't clobber the real one if -# objfile == srcdir. set remote_guile_file [gdb_remote_download host \ - ${srcdir}/${subdir}/${testfile}.scm \ - ${subdir}/t-${testfile}.scm] + ${srcdir}/${subdir}/${testfile}.scm] gdb_scm_load_file "$remote_guile_file" "load script" diff --git a/gdb/testsuite/gdb.guile/scm-section-script.exp b/gdb/testsuite/gdb.guile/scm-section-script.exp index 0c5e489..ba496dc 100644 --- a/gdb/testsuite/gdb.guile/scm-section-script.exp +++ b/gdb/testsuite/gdb.guile/scm-section-script.exp @@ -35,14 +35,10 @@ standard_testfile # Make this available to gdb before the program starts, it is # automagically loaded by gdb. -# Give the file a new name so we don't clobber the real one if -# objfile == srcdir. # We also need to do this before compiling the program because the name # of the script file is encoded in the binary. -# FIXME: Can we get gdb_remote_download to call standard_output_file for us? set remote_guile_file [gdb_remote_download host \ - ${srcdir}/${subdir}/${testfile}.scm \ - ${subdir}/t-${testfile}.scm] + ${srcdir}/${subdir}/${testfile}.scm] if {[build_executable $testfile.exp $testfile $srcfile \ [list debug "additional_flags=-I${srcdir}/../../include -DSCRIPT_FILE=\"$remote_guile_file\""]] == -1} { |