misc/cgo/stdio: reenable tests

The build tags are necessary to keep "go build" in that directory
building only stdio.go, but we have to arrange for test/run.go to
treat them as satisfied.

Fixes #12625.

Change-Id: Iec0cb2fdc2c9b24a4e0530be25e940aa0cc9552e
Reviewed-on: https://go-review.googlesource.com/17454
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/misc/cgo/life/main.go b/misc/cgo/life/main.go
index 725e10f76c262b3ce11a78bb7b92ec6c064f262d..c17cd6c92c0722c85a1fbb9858180d784a42c877 100644 (file)
--- a/misc/cgo/life/main.go
+++ b/misc/cgo/life/main.go
@@ -4,7 +4,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build ignore
+// +build test_run
 
 // Run the game of life in C using Go for parallelization.
 

diff --git a/misc/cgo/stdio/chain.go b/misc/cgo/stdio/chain.go
index a55cefa40c20dbb98388b7ca8262ef8b106303c3..1256133e2fa99e94b8703cc7c828becf2c220d4b 100644 (file)
--- a/misc/cgo/stdio/chain.go
+++ b/misc/cgo/stdio/chain.go
@@ -4,16 +4,17 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build ignore
+// +build test_run
 
 // Pass numbers along a chain of threads.
 
 package main
 
 import (
-       "../stdio"
        "runtime"
        "strconv"
+
+       "../stdio"
 )
 
 const N = 10

diff --git a/misc/cgo/stdio/fib.go b/misc/cgo/stdio/fib.go
index 981ffeb9abd5b9579c96dd829ae517969901edc5..eb43cf5daf496ac8434ad4113a6a689dd3d03ae0 100644 (file)
--- a/misc/cgo/stdio/fib.go
+++ b/misc/cgo/stdio/fib.go
@@ -4,7 +4,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build ignore
+// +build test_run
 
 // Compute Fibonacci numbers with two goroutines
 // that pass integers back and forth.  No actual
@@ -14,9 +14,10 @@
 package main
 
 import (
-       "../stdio"
        "runtime"
        "strconv"
+
+       "../stdio"
 )
 
 func fibber(c, out chan int64, i int64) {

diff --git a/misc/cgo/stdio/hello.go b/misc/cgo/stdio/hello.go
index 9cfeefbba701b8b90da893ea5ba2018054166f9f..60c0304e2e4f1f0321657f03cd4a3c822faf593a 100644 (file)
--- a/misc/cgo/stdio/hello.go
+++ b/misc/cgo/stdio/hello.go
@@ -4,7 +4,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build ignore
+// +build test_run
 
 package main
 

diff --git a/test/run.go b/test/run.go
index d3f58b77829edcf0909ec974cf449e3b983e9f5e..52230efc4291fdcbf91ca9b8fd19e6e48e90c037 100644 (file)
--- a/test/run.go
+++ b/test/run.go
@@ -400,6 +400,10 @@ func (ctxt *context) match(name string) bool {
                return true
        }
 
+       if name == "test_run" {
+               return true
+       }
+
        return false
 }