Mercurial > hg > openjdk > jdk6

changeset 71:68fddc52a231

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7032311: Correct top level 'make test' target and add known failures to problem list Reviewed-by: darcy
author ohair
date Tue, 29 Mar 2011 17:17:23 -0700
parents f30a5896c305
children 2077a63d319f
files Makefile test/Makefile
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Mar 24 07:46:40 2011 -0700
+++ b/Makefile	Tue Mar 29 17:17:23 2011 -0700
@@ -450,7 +450,7 @@
 # Get failure list from log
 $(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt
 	@$(RM) $@
-	@( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) > $@
+	@( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) | $(NAWK) 'length>0' > $@
 
 # Get log file of all tests run
 JDK_TO_TEST := $(shell 							\
@@ -464,8 +464,12 @@
 )
 $(OUTPUTDIR)/test_log.txt:
 	$(RM) $@
-	( $(CD) test &&                                     \
-          $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) \
+	( $(CD) test &&                                     		\
+          $(MAKE) NO_STOPPING=- 					\
+	          ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)			\
+		  ALT_JDK_IMPORT_PATH=$(JDK_TO_TEST) 			\
+		  PRODUCT_HOME=$(JDK_TO_TEST) 				\
+	          LANGTOOLS_PRODUCT_HOME=$(ABS_OUTPUTDIR)/langtools 	\
         ) | tee $@
 
 ################################################################
--- a/test/Makefile	Thu Mar 24 07:46:40 2011 -0700
+++ b/test/Makefile	Tue Mar 29 17:17:23 2011 -0700
@@ -50,7 +50,7 @@
 endef
 
 # Test target list for langtools repository
-LANGTOOLS_TEST_LIST = langtools_jtreg
+LANGTOOLS_TEST_LIST = all
 
 # Test target list for jdk repository
 JDK_TEST_LIST = \
@@ -78,9 +78,9 @@
 
 # Test targets
 $(LANGTOOLS_TEST_LIST):
-	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
+	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $@ PRODUCT_HOME=$(LANGTOOLS_PRODUCT_HOME))
 $(JDK_TEST_LIST):
-	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
+	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@ PRODUCT_HOME=$(PRODUCT_HOME))
 
 clean: