diff options
author | Tom Tromey <tromey@redhat.com> | 2012-06-25 19:13:25 +0000 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2012-06-25 19:13:25 +0000 |
commit | 8a3e1f8d521c1ba7f4aa0449138f55106273afc2 (patch) | |
tree | 22d94037b619b19bf72db66765be023c41bf9c8a /gdb/testsuite/gdb.go | |
parent | adb4fe3b309bace3ceb2c0e305f7faf41eb708a6 (diff) | |
download | gdb-8a3e1f8d521c1ba7f4aa0449138f55106273afc2.zip gdb-8a3e1f8d521c1ba7f4aa0449138f55106273afc2.tar.gz gdb-8a3e1f8d521c1ba7f4aa0449138f55106273afc2.tar.bz2 |
* lib/gdb.exp (standard_output_file): Use "file join".
* gdb.go/chan.exp: Use standard_testfile.
* gdb.go/handcall.exp: Use standard_testfile.
* gdb.go/hello.exp: Use standard_testfile.
* gdb.integers/chan.exp: Use standard_testfile.
* gdb.go/methods.exp: Use standard_testfile.
* gdb.go/package.exp: Use standard_testfile.
* gdb.go/strings.exp: Use standard_testfile.
* gdb.go/types.exp: Use standard_testfile.
* gdb.go/unsafe.exp: Use standard_testfile.
Diffstat (limited to 'gdb/testsuite/gdb.go')
-rw-r--r-- | gdb/testsuite/gdb.go/chan.exp | 3 | ||||
-rw-r--r-- | gdb/testsuite/gdb.go/handcall.exp | 3 | ||||
-rw-r--r-- | gdb/testsuite/gdb.go/hello.exp | 3 | ||||
-rw-r--r-- | gdb/testsuite/gdb.go/integers.exp | 3 | ||||
-rw-r--r-- | gdb/testsuite/gdb.go/methods.exp | 3 | ||||
-rw-r--r-- | gdb/testsuite/gdb.go/package.exp | 14 | ||||
-rw-r--r-- | gdb/testsuite/gdb.go/strings.exp | 3 | ||||
-rw-r--r-- | gdb/testsuite/gdb.go/types.exp | 3 | ||||
-rw-r--r-- | gdb/testsuite/gdb.go/unsafe.exp | 3 |
9 files changed, 11 insertions, 27 deletions
diff --git a/gdb/testsuite/gdb.go/chan.exp b/gdb/testsuite/gdb.go/chan.exp index 317e214..1becbc1 100644 --- a/gdb/testsuite/gdb.go/chan.exp +++ b/gdb/testsuite/gdb.go/chan.exp @@ -22,8 +22,7 @@ load_lib "go.exp" if { [skip_go_tests] } { continue } -set testfile "chan" -set srcfile ${testfile}.go +standard_testfile .go if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { return -1 diff --git a/gdb/testsuite/gdb.go/handcall.exp b/gdb/testsuite/gdb.go/handcall.exp index 077186e..7dd6d6e 100644 --- a/gdb/testsuite/gdb.go/handcall.exp +++ b/gdb/testsuite/gdb.go/handcall.exp @@ -21,8 +21,7 @@ load_lib "go.exp" if { [skip_go_tests] } { continue } -set testfile "handcall" -set srcfile ${testfile}.go +standard_testfile .go if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { return -1 diff --git a/gdb/testsuite/gdb.go/hello.exp b/gdb/testsuite/gdb.go/hello.exp index e6abfb9..94f9b67 100644 --- a/gdb/testsuite/gdb.go/hello.exp +++ b/gdb/testsuite/gdb.go/hello.exp @@ -21,8 +21,7 @@ load_lib "go.exp" if { [skip_go_tests] } { continue } -set testfile "hello" -set srcfile ${testfile}.go +standard_testfile .go if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { return -1 diff --git a/gdb/testsuite/gdb.go/integers.exp b/gdb/testsuite/gdb.go/integers.exp index 202c56d..68626c7 100644 --- a/gdb/testsuite/gdb.go/integers.exp +++ b/gdb/testsuite/gdb.go/integers.exp @@ -21,8 +21,7 @@ load_lib "go.exp" if { [skip_go_tests] } { continue } -set testfile "integers" -set srcfile ${testfile}.go +standard_testfile .go if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { return -1 diff --git a/gdb/testsuite/gdb.go/methods.exp b/gdb/testsuite/gdb.go/methods.exp index e63870a..31a441e 100644 --- a/gdb/testsuite/gdb.go/methods.exp +++ b/gdb/testsuite/gdb.go/methods.exp @@ -21,8 +21,7 @@ load_lib "go.exp" if { [skip_go_tests] } { continue } -set testfile "methods" -set srcfile ${testfile}.go +standard_testfile .go if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { return -1 diff --git a/gdb/testsuite/gdb.go/package.exp b/gdb/testsuite/gdb.go/package.exp index 80d51cc..a9186ac 100644 --- a/gdb/testsuite/gdb.go/package.exp +++ b/gdb/testsuite/gdb.go/package.exp @@ -21,21 +21,13 @@ load_lib "go.exp" if { [skip_go_tests] } { continue } -set testfile "package" -set binfile ${objdir}/${subdir}/${testfile} +standard_testfile package1.go package2.go -if { [gdb_compile "${srcdir}/${subdir}/${testfile}2.go" "${binfile}2.o" object {debug go}] != "" } { - untested $testfile +if {[prepare_for_testing $testfile.exp $testfile [list $srcfile $srcfile2] \ + [list debug go libdir=[standard_output_file {}]]]} { return -1 } -if { [gdb_compile "${srcdir}/${subdir}/${testfile}1.go ${binfile}2.o" "${binfile}" executable "debug go libdir=${objdir}/${subdir}"] != "" } { - untested $testfile - return -1 -} - -clean_restart $testfile - if { [go_runto_main] < 0 } { untested methods return -1 diff --git a/gdb/testsuite/gdb.go/strings.exp b/gdb/testsuite/gdb.go/strings.exp index b1b3fed..a4885a9 100644 --- a/gdb/testsuite/gdb.go/strings.exp +++ b/gdb/testsuite/gdb.go/strings.exp @@ -19,8 +19,7 @@ load_lib "go.exp" if { [skip_go_tests] } { continue } -set testfile "strings" -set srcfile ${testfile}.go +standard_testfile .go if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { return -1 diff --git a/gdb/testsuite/gdb.go/types.exp b/gdb/testsuite/gdb.go/types.exp index 20ac910..da9d387 100644 --- a/gdb/testsuite/gdb.go/types.exp +++ b/gdb/testsuite/gdb.go/types.exp @@ -21,8 +21,7 @@ load_lib "go.exp" if { [skip_go_tests] } { continue } -set testfile "types" -set srcfile ${testfile}.go +standard_testfile .go if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { return -1 diff --git a/gdb/testsuite/gdb.go/unsafe.exp b/gdb/testsuite/gdb.go/unsafe.exp index 1535ce2..eb536b2 100644 --- a/gdb/testsuite/gdb.go/unsafe.exp +++ b/gdb/testsuite/gdb.go/unsafe.exp @@ -21,8 +21,7 @@ load_lib "go.exp" if { [skip_go_tests] } { continue } -set testfile "unsafe" -set srcfile ${testfile}.go +standard_testfile .go if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug go}] } { return -1 |