aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2011-04-06 15:06:28 -0400
committerRuss Cox <rsc@golang.org>2011-04-06 15:06:28 -0400
commit0ea7bf486708dfbdd6e652812eaa8514eeed00a9 (patch)
tree415284c54e7742bad7dde0806fac81d06e0c2c17
parent5ee13c0d59de2f26dacc53046ce265232eeb6f2b (diff)
downloadgo-0ea7bf486708dfbdd6e652812eaa8514eeed00a9.tar.xz
src/pkg/Makefile: trim per-directory make output except on failure
Not committed to this but it sure makes the output easier to skim. With this CL: $ make install runtime install sync/atomic install sync install unicode install utf16 install syscall install os ... install ../cmd/govet install ../cmd/goyacc install ../cmd/hgpatch $ make test test archive/tar test archive/zip test asn1 test big test bufio ... test path test path/filepath TEST FAIL reflect gotest rm -f _test/reflect.a 6g -o _gotest_.6 deepequal.go type.go value.go rm -f _test/reflect.a gopack grc _test/reflect.a _gotest_.6 all_test.go:210: invalid type assertion: reflect.NewValue(tt.i).(*StructValue) (non-interface type reflect.Value on left) all_test.go:217: cannot type switch on non-interface value v (type reflect.Value) all_test.go:218: undefined: IntValue all_test.go:221: cannot use 132 (type int) as type reflect.Value in function argument all_test.go:223: cannot use 8 (type int) as type reflect.Value in function argument all_test.go:225: cannot use 16 (type int) as type reflect.Value in function argument all_test.go:227: cannot use 32 (type int) as type reflect.Value in function argument all_test.go:229: cannot use 64 (type int) as type reflect.Value in function argument all_test.go:231: undefined: UintValue all_test.go:234: cannot use 132 (type int) as type reflect.Value in function argument all_test.go:234: too many errors gotest: "/Users/rsc/g/go/bin/6g -I _test -o _xtest_.6 all_test.go tostring_test.go" failed: exit status 1 make[1]: *** [test] Error 2 make: *** [reflect.test] Error 1 R=r, r2 CC=golang-dev https://golang.org/cl/4343046
-rw-r--r--src/Make.pkg2
-rw-r--r--src/pkg/Makefile9
2 files changed, 7 insertions, 4 deletions
diff --git a/src/Make.pkg b/src/Make.pkg
index f871cf9398..59ce56ac0d 100644
--- a/src/Make.pkg
+++ b/src/Make.pkg
@@ -55,7 +55,7 @@ coverage:
gotest
6cov -g $(shell pwd) $O.out | grep -v '_test\.go:'
-CLEANFILES+=*.so _obj _test _testmain.go *.exe _cgo* *.cgo[12].*
+CLEANFILES+=*.so _obj _test _testmain.go *.exe _cgo* *.cgo[12].* test.out build.out
test:
gotest
diff --git a/src/pkg/Makefile b/src/pkg/Makefile
index 4171c2fd65..dd0dd9cd6c 100644
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -230,16 +230,19 @@ bench.dirs: $(addsuffix .bench, $(BENCH))
+$(MAKE) -C $* clean
%.install:
- +$(MAKE) -C $* install
+ +@echo install $*
+ +@$(MAKE) -C $* install >$*/build.out 2>&1 || (echo INSTALL FAIL $*; cat $*/build.out)
%.nuke:
+$(MAKE) -C $* nuke
%.test:
- +$(MAKE) -C $* test
+ +@echo test $*
+ +@$(MAKE) -C $* test >$*/test.out 2>&1 || (echo TEST FAIL $*; cat $*/test.out; exit 1)
%.testshort:
- +$(MAKE) -C $* testshort
+ +@echo test $*
+ +@$(MAKE) -C $* testshort >$*/test.out 2>&1 || (echo TEST FAIL $*; cat $*/test.out; exit 1)
%.bench:
+$(MAKE) -C $* bench