Commit 90010f8f authored by Shenghou Ma's avatar Shenghou Ma

build: re-enable some broken tests in run.bash

        Updates #2982.

R=rsc, rsc
CC=golang-dev
https://golang.org/cl/5759064
parent 5c4d6ebb
...@@ -24,10 +24,10 @@ _testmain.go ...@@ -24,10 +24,10 @@ _testmain.go
build.out build.out
test.out test.out
doc/tmpltohtml doc/tmpltohtml
doc/codelab/wiki/*.bin doc/articles/wiki/*.bin
misc/cgo/life/run.out misc/cgo/life/run.out
misc/cgo/stdio/run.out misc/cgo/stdio/run.out
misc/dashboard/builder/gobuilder misc/dashboard/builder/builder
misc/goplay/goplay misc/goplay/goplay
misc/osx/*.pkg misc/osx/*.pkg
misc/osx/*.dmg misc/osx/*.dmg
......
...@@ -39,8 +39,6 @@ xcd() { ...@@ -39,8 +39,6 @@ xcd() {
builtin cd "$GOROOT"/src/$1 builtin cd "$GOROOT"/src/$1
} }
BROKEN=true
[ "$CGO_ENABLED" != 1 ] || [ "$CGO_ENABLED" != 1 ] ||
[ "$GOHOSTOS" == windows ] || [ "$GOHOSTOS" == windows ] ||
(xcd ../misc/cgo/stdio (xcd ../misc/cgo/stdio
...@@ -70,33 +68,24 @@ $BROKEN || ...@@ -70,33 +68,24 @@ $BROKEN ||
time ./run time ./run
) || exit $? ) || exit $?
$BROKEN ||
[ "$GOARCH" == arm ] || # uses network, fails under QEMU [ "$GOARCH" == arm ] || # uses network, fails under QEMU
(xcd ../doc/codelab/wiki (xcd ../doc/articles/wiki
"$GOMAKE" clean make clean
"$GOMAKE" ./test.sh
"$GOMAKE" test
) || exit $? ) || exit $?
$BROKEN || echo
for i in ../misc/dashboard/builder ../misc/goplay echo '#' ../misc/dashboard/builder ../misc/goplay
do go build ../misc/dashboard/builder ../misc/goplay || exit $?
(xcd $i
"$GOMAKE" clean
"$GOMAKE"
) || exit $?
done
$BROKEN ||
[ "$GOARCH" == arm ] || [ "$GOARCH" == arm ] ||
(xcd ../test/bench/shootout (xcd ../test/bench/shootout
./timing.sh -test ./timing.sh -test
) || exit $? ) || exit $?
$BROKEN || echo
(xcd ../test/bench/go1 echo '#' ../test/bench/go1
"$GOMAKE" test go test ../test/bench/go1 || exit $?
) || exit $?
(xcd ../test (xcd ../test
time go run run.go time go run run.go
......
TARG=go1
test:
echo go1: tests disabled for now TODO
package go1
// Nothing to see here: everything is in the _test files.
...@@ -21,20 +21,14 @@ var ( ...@@ -21,20 +21,14 @@ var (
func init() { func init() {
var buf bytes.Buffer var buf bytes.Buffer
c, err := gz.NewWriter(&buf) c := gz.NewWriter(&buf)
if err != nil {
panic(err)
}
c.Write(jsongunz) c.Write(jsongunz)
c.Close() c.Close()
jsongz = buf.Bytes() jsongz = buf.Bytes()
} }
func gzip() { func gzip() {
c, err := gz.NewWriter(ioutil.Discard) c := gz.NewWriter(ioutil.Discard)
if err != nil {
panic(err)
}
if _, err := c.Write(jsongunz); err != nil { if _, err := c.Write(jsongunz); err != nil {
panic(err) panic(err)
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment