From: Russ Cox <rsc@golang.org>
Date: Wed, 6 Apr 2011 19:06:28 +0000 (-0400)
Subject: src/pkg/Makefile: trim per-directory make output except on failure
X-Git-Tag: weekly.2011-04-13~86
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0ea7bf486708dfbdd6e652812eaa8514eeed00a9;p=gostls13.git

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
---

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