11 files changed, 11 insertions, 22 deletions

diff --git a/gdb/testsuite/gdb.go/chan.exp b/gdb/testsuite/gdb.go/chan.exp
index cca9032..075d9f8 100644
--- a/gdb/testsuite/gdb.go/chan.exp
+++ b/gdb/testsuite/gdb.go/chan.exp
@@ -20,8 +20,7 @@
 
 load_lib "go.exp"
 
-require !skip_go_tests
-if { [support_go_compile] == 0 } { continue }
+require !skip_go_tests support_go_compile
 
 standard_testfile .go
 
diff --git a/gdb/testsuite/gdb.go/global-local-var-shadow.exp b/gdb/testsuite/gdb.go/global-local-var-shadow.exp
index 8bede6b..8513c55 100644
--- a/gdb/testsuite/gdb.go/global-local-var-shadow.exp
+++ b/gdb/testsuite/gdb.go/global-local-var-shadow.exp
@@ -19,8 +19,7 @@
 
 load_lib "go.exp"
 
-require !skip_go_tests
-if { [support_go_compile] == 0 } { continue }
+require !skip_go_tests support_go_compile
 
 standard_testfile .go
 
diff --git a/gdb/testsuite/gdb.go/handcall.exp b/gdb/testsuite/gdb.go/handcall.exp
index f132a15..530bddf 100644
--- a/gdb/testsuite/gdb.go/handcall.exp
+++ b/gdb/testsuite/gdb.go/handcall.exp
@@ -19,8 +19,7 @@
 
 load_lib "go.exp"
 
-require !skip_go_tests
-if { [support_go_compile] == 0 } { continue }
+require !skip_go_tests support_go_compile
 
 standard_testfile .go
 
diff --git a/gdb/testsuite/gdb.go/hello.exp b/gdb/testsuite/gdb.go/hello.exp
index 6975252..5f7da34 100644
--- a/gdb/testsuite/gdb.go/hello.exp
+++ b/gdb/testsuite/gdb.go/hello.exp
@@ -19,8 +19,7 @@
 
 load_lib "go.exp"
 
-require !skip_go_tests
-if { [support_go_compile] == 0 } { continue }
+require !skip_go_tests support_go_compile
 
 standard_testfile .go
 
diff --git a/gdb/testsuite/gdb.go/integers.exp b/gdb/testsuite/gdb.go/integers.exp
index 1bd1c1e..7c06d05 100644
--- a/gdb/testsuite/gdb.go/integers.exp
+++ b/gdb/testsuite/gdb.go/integers.exp
@@ -19,8 +19,7 @@
 
 load_lib "go.exp"
 
-require !skip_go_tests
-if { [support_go_compile] == 0 } { continue }
+require !skip_go_tests support_go_compile
 
 standard_testfile .go
 
diff --git a/gdb/testsuite/gdb.go/max-depth.exp b/gdb/testsuite/gdb.go/max-depth.exp
index 78a4c41..8fa967c 100644
--- a/gdb/testsuite/gdb.go/max-depth.exp
+++ b/gdb/testsuite/gdb.go/max-depth.exp
@@ -19,8 +19,7 @@
 
 load_lib "go.exp"
 
-require !skip_go_tests
-if { [support_go_compile] == 0 } { continue }
+require !skip_go_tests support_go_compile
 
 standard_testfile .go
 
diff --git a/gdb/testsuite/gdb.go/methods.exp b/gdb/testsuite/gdb.go/methods.exp
index 221bf3e..f641c1c 100644
--- a/gdb/testsuite/gdb.go/methods.exp
+++ b/gdb/testsuite/gdb.go/methods.exp
@@ -19,8 +19,7 @@
 
 load_lib "go.exp"
 
-require !skip_go_tests
-if { [support_go_compile] == 0 } { continue }
+require !skip_go_tests support_go_compile
 
 standard_testfile .go
 
diff --git a/gdb/testsuite/gdb.go/package.exp b/gdb/testsuite/gdb.go/package.exp
index 247f21b..8c64d2c 100644
--- a/gdb/testsuite/gdb.go/package.exp
+++ b/gdb/testsuite/gdb.go/package.exp
@@ -19,8 +19,7 @@
 
 load_lib "go.exp"
 
-require !skip_go_tests
-if { [support_go_compile] == 0 } { continue }
+require !skip_go_tests support_go_compile
 
 standard_testfile package1.go package2.go
 
diff --git a/gdb/testsuite/gdb.go/strings.exp b/gdb/testsuite/gdb.go/strings.exp
index 2be756a..1bca714 100644
--- a/gdb/testsuite/gdb.go/strings.exp
+++ b/gdb/testsuite/gdb.go/strings.exp
@@ -17,8 +17,7 @@
 
 load_lib "go.exp"
 
-require !skip_go_tests
-if { [support_go_compile] == 0 } { continue }
+require !skip_go_tests support_go_compile
 
 standard_testfile .go
 
diff --git a/gdb/testsuite/gdb.go/types.exp b/gdb/testsuite/gdb.go/types.exp
index 992f5cb..22656f2 100644
--- a/gdb/testsuite/gdb.go/types.exp
+++ b/gdb/testsuite/gdb.go/types.exp
@@ -19,8 +19,7 @@
 
 load_lib "go.exp"
 
-require !skip_go_tests
-if { [support_go_compile] == 0 } { continue }
+require !skip_go_tests support_go_compile
 
 standard_testfile .go
 
diff --git a/gdb/testsuite/gdb.go/unsafe.exp b/gdb/testsuite/gdb.go/unsafe.exp
index 9b5c26e..5a2bf32 100644
--- a/gdb/testsuite/gdb.go/unsafe.exp
+++ b/gdb/testsuite/gdb.go/unsafe.exp
@@ -19,8 +19,7 @@
 
 load_lib "go.exp"
 
-require !skip_go_tests
-if { [support_go_compile] == 0 } { continue }
+require !skip_go_tests support_go_compile
 
 standard_testfile .go