1.1 --- a/Makefile Tue Sep 07 15:51:45 2010 -0700
1.2 +++ b/Makefile Fri Sep 24 14:03:33 2010 -0700
1.3 @@ -558,9 +558,12 @@
1.4 # rule to test
1.5 ################################################################
1.6
1.7 -.NOTPARALLEL: test
1.8 +.NOTPARALLEL: test_run
1.9
1.10 -test: test_clean test_start test_summary
1.11 +test:
1.12 + $(MAKE) test_run
1.13 +
1.14 +test_run: test_clean test_start test_summary
1.15
1.16 test_start:
1.17 @$(ECHO) "Tests started at `$(DATE)`"
1.18 @@ -586,7 +589,7 @@
1.19 # Get failure list from log
1.20 $(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt
1.21 @$(RM) $@
1.22 - @( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) > $@
1.23 + @( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) | $(NAWK) 'length>0' > $@
1.24
1.25 # Get log file of all tests run
1.26 JDK_TO_TEST := $(shell \
1.27 @@ -598,10 +601,11 @@
1.28 $(ECHO) "$(PRODUCT_HOME)"; \
1.29 fi \
1.30 )
1.31 +TEST_TARGETS=all
1.32 $(OUTPUTDIR)/test_log.txt:
1.33 $(RM) $@
1.34 - ( $(CD) test && \
1.35 - $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) \
1.36 + ( $(CD) test && \
1.37 + $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) $(TEST_TARGETS) \
1.38 ) | tee $@
1.39
1.40 ################################################################
1.41 @@ -614,7 +618,7 @@
1.42 # PHONY
1.43 ################################################################
1.44
1.45 -.PHONY: all test test_start test_summary test_clean \
1.46 +.PHONY: all test test_run test_start test_summary test_clean \
1.47 generic_build_repo_series \
1.48 what clobber insane \
1.49 dev dev-build dev-sanity dev-clobber \
