* 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.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index cec39a0a77441d2e1b2f706b8d674966aaa82ea9..7c4fe35bac3f26e5499285b446aaf96a2eb0e5a2 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2012-06-25  Tom Tromey  <tromey@redhat.com>
+
+       * 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.
+
 2012-06-25  Greta Yorsh  <greta.yorsh@arm.com>
 
        * gdb.arch/arm-disp-step.S: Fix use of .global directives.

diff --git a/gdb/testsuite/gdb.go/chan.exp b/gdb/testsuite/gdb.go/chan.exp
index 317e21406b229eeb49b816a1006128ff8b196f76..1becbc1ee637263796c0ee0eea9213948a69868e 100644 (file)
--- 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 077186eaec0a03b50394cf848733ad0136caf0eb..7dd6d6eb9191464ba141619964d59b7140164d79 100644 (file)
--- 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 e6abfb99da30db007cc1686b3af29208465afd8e..94f9b67ad49f316a25b67f8ec79fcc8d094ac2f6 100644 (file)
--- 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 202c56d17e27c15281f680326b3b8d9b2747ccb8..68626c7b294ca0221fc584024329388178d22432 100644 (file)
--- 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 e63870af262d3cad73abf006bfd8374185c67149..31a441e8d1d6892d0f0a8a0f83cee1a065226077 100644 (file)
--- 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 80d51cc25f15e1178af8c02e9e06dd68547be5e6..a9186ac2df43019f1c8b3c7fdb0daf68e16b2ed3 100644 (file)
--- 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 b1b3fed3d672cd7334c3e14dffae937bd479acbd..a4885a93543ef8db8a4e095732c31992f3bc90ce 100644 (file)
--- 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 20ac910118ff9c8150e7f2b0457514730f8f1082..da9d387b43002d09b07d86fa1ca417dc238f3dcd 100644 (file)
--- 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 1535ce2df06a83ea526457f8e0e0aa3535d41475..eb536b2d841cf5d6e6ffecbdfc462487795ecb43 100644 (file)
--- 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

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index b40eef8361ccedbd20e82a7c06b1a4354094b8a9..7cb619a85552ce8ec85ef8d855404108d91c4a60 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -3067,12 +3067,13 @@ proc default_gdb_init { args } {
 }
 
 # Turn BASENAME into a full file name in the standard output
-# directory.
+# directory.  It is ok if BASENAME is the empty string; in this case
+# the directory is returned.
 
 proc standard_output_file {basename} {
     global objdir subdir
 
-    return $objdir/$subdir/$basename
+    return [file join $objdir $subdir $basename]
 }
 
 # Set 'testfile', 'srcfile', and 'binfile'.