From: Russ Cox <rsc@golang.org>
Date: Wed, 13 Apr 2011 20:24:57 +0000 (-0400)
Subject: build: tidy intermediate files during build
X-Git-Tag: weekly.2011-04-13~17
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1499c78281d15fcc26198f3d61eb87b18729ed96;p=gostls13.git

build: tidy intermediate files during build

This CL changes the behavior of 'make install' and 'make test'
in the src/cmd directory and the src/pkg directory to have
each recursive make clean up after itself immediately.

It does the same in test/run, removing $F.$A and $A.out
(the common byproducts) between runs.

On machines with slow disks and aggressive kernel caching,
cleaning up immediately can mean that the intermediate
objects never get written to disk.

This change eliminates almost all the disk waiting during
all.bash on my laptop (a Thinkpad X201s with an SSD running Linux).

147.50u 19.95s 277.34r	before
148.53u 21.64s 179.59r	after

R=golang-dev, r, iant2
CC=golang-dev
https://golang.org/cl/4413042
---

diff --git a/src/Make.common b/src/Make.common
index af6d04adc1..34d7016f42 100644
--- a/src/Make.common
+++ b/src/Make.common
@@ -5,6 +5,15 @@
 clean:
 	rm -rf *.o *.a *.[$(OS)] [$(OS)].out $(CLEANFILES)
 
+install.clean: install
+	rm -rf *.o *.a *.[$(OS)] [$(OS)].out $(CLEANFILES)
+
+test.clean: test
+	rm -rf *.o *.a *.[$(OS)] [$(OS)].out $(CLEANFILES)
+
+testshort.clean: testshort
+	rm -rf *.o *.a *.[$(OS)] [$(OS)].out $(CLEANFILES)
+
 %.make:
 	$(MAKE) -C $* install
 
diff --git a/src/pkg/Makefile b/src/pkg/Makefile
index 8eaf39d79d..2e6e092b0b 100644
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -233,18 +233,18 @@ bench.dirs: $(addsuffix .bench, $(BENCH))
 
 %.install:
 	+@echo install $*
-	+@$(MAKE) -C $* install >$*/build.out 2>&1 || (echo INSTALL FAIL $*; cat $*/build.out; exit 1)
+	+@$(MAKE) -C $* install.clean >$*/build.out 2>&1 || (echo INSTALL FAIL $*; cat $*/build.out; exit 1)
 
 %.nuke:
 	+$(MAKE) -C $* nuke
 
 %.test:
 	+@echo test $*
-	+@$(MAKE) -C $* test >$*/test.out 2>&1 || (echo TEST FAIL $*; cat $*/test.out; exit 1)
+	+@$(MAKE) -C $* test.clean >$*/test.out 2>&1 || (echo TEST FAIL $*; cat $*/test.out; exit 1)
 
 %.testshort:
 	+@echo test $*
-	+@$(MAKE) -C $* testshort >$*/test.out 2>&1 || (echo TEST FAIL $*; cat $*/test.out; exit 1)
+	+@$(MAKE) -C $* testshort.clean >$*/test.out 2>&1 || (echo TEST FAIL $*; cat $*/test.out; exit 1)
 
 %.bench:
 	+$(MAKE) -C $* bench	
diff --git a/test/run b/test/run
index a74933f358..628cc2d7b4 100755
--- a/test/run
+++ b/test/run
@@ -99,6 +99,7 @@ do
 			echo $i >>pass.out
 		fi
 		echo $(awk 'NR==1{print $2}' $TMP2FILE) $D/$F >>times.out
+		rm -f $F.$A $A.out
 	) done
 done | # clean up some stack noise
 	egrep -v '^(r[0-9a-z]+|[cfg]s)  +0x'  |