diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.go/package.exp | 11 |
2 files changed, 14 insertions, 2 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 339cb0a..36a3534 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-06-28 Tom Tromey <tromey@redhat.com> + + * gdb.go/package.exp: Partially revert earlier patch; use + gdb_compile again. Use standard_output_file. + 2012-06-27 Doug Evans <dje@google.com> * gdb.dwarf2/fission-base.c: New file. diff --git a/gdb/testsuite/gdb.go/package.exp b/gdb/testsuite/gdb.go/package.exp index a9186ac..1fd65fc 100644 --- a/gdb/testsuite/gdb.go/package.exp +++ b/gdb/testsuite/gdb.go/package.exp @@ -23,10 +23,17 @@ if { [skip_go_tests] } { continue } standard_testfile package1.go package2.go -if {[prepare_for_testing $testfile.exp $testfile [list $srcfile $srcfile2] \ - [list debug go libdir=[standard_output_file {}]]]} { +if { [gdb_compile "${srcdir}/${subdir}/${testfile}2.go" "${binfile}2.o" object {debug go}] != "" } { + untested $testfile return -1 } + +if { [gdb_compile "${srcdir}/${subdir}/${testfile}1.go ${binfile}2.o" "${binfile}" executable "debug go libdir=[standard_output_file {}]"] != "" } { + untested $testfile + return -1 +} + +clean_restart $testfile if { [go_runto_main] < 0 } { untested methods |