test/bench: enable build and test on Windows

R=golang-dev, rsc1
CC=golang-dev
https://golang.org/cl/4366043

diff --git a/src/run.bash b/src/run.bash
index 8ad11e2ae29757e19da1181e89c8e92fc3f40482..91cd3cc997e2e689a1abb9c4cbd352c0a190d40c 100755 (executable)
--- a/src/run.bash
+++ b/src/run.bash
@@ -113,7 +113,6 @@ do
 done
 
 [ "$GOARCH" == arm ] ||
-[ "$GOHOSTOS" == windows ] ||
 (xcd ../test/bench
 ./timing.sh -test
 ) || exit $?

diff --git a/test/bench/regex-dna-parallel.go b/test/bench/regex-dna-parallel.go
index e8e62b806da62a1633e98430ab83809132eb808c..1335e4d34fdf11b41032c413a9284d3a15cd42b6 100644 (file)
--- a/test/bench/regex-dna-parallel.go
+++ b/test/bench/regex-dna-parallel.go
@@ -89,7 +89,7 @@ func countMatches(pat string, bytes []byte) int {
 
 func main() {
        runtime.GOMAXPROCS(4)
-       bytes, err := ioutil.ReadFile("/dev/stdin")
+       bytes, err := ioutil.ReadAll(os.Stdin)
        if err != nil {
                fmt.Fprintf(os.Stderr, "can't read input: %s\n", err)
                os.Exit(2)

diff --git a/test/bench/regex-dna.go b/test/bench/regex-dna.go
index dc31db7685a4b1d5f1af39911e7895ca97631cde..042d7f28361a4abfdaf7af3e5727da2715fbf4e2 100644 (file)
--- a/test/bench/regex-dna.go
+++ b/test/bench/regex-dna.go
@@ -87,7 +87,7 @@ func countMatches(pat string, bytes []byte) int {
 }
 
 func main() {
-       bytes, err := ioutil.ReadFile("/dev/stdin")
+       bytes, err := ioutil.ReadAll(os.Stdin)
        if err != nil {
                fmt.Fprintf(os.Stderr, "can't read input: %s\n", err)
                os.Exit(2)