From b2e2be304684bc50b36ea7e53bf7844521cf91cd Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Tue, 20 Aug 2013 17:44:35 -0700 Subject: [PATCH 1/4] 8023433: Improve 'make help' Reviewed-by: tbell --- NewMakefile.gmk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NewMakefile.gmk b/NewMakefile.gmk index 101ebe06278..4ddbc89c841 100644 --- a/NewMakefile.gmk +++ b/NewMakefile.gmk @@ -98,6 +98,7 @@ help: $(info . # corba and jdk) $(info . make all # Compile everything, all repos and images) $(info . make images # Create complete j2sdk and j2re images) + $(info . make docs # Create javadocs) $(info . make overlay-images # Create limited images for sparc 64 bit platforms) $(info . make profiles # Create complete j2re compact profile images) $(info . make bootcycle-images # Build images twice, second time with newly build JDK) @@ -109,7 +110,7 @@ help: $(info . make test # Run tests, default is all tests (see TEST below)) $(info ) $(info Targets for specific components) - $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, images or overlay-images)) + $(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test)) $(info . make # Build and everything it depends on. ) $(info . make -only # Build only, without dependencies. This) $(info . # is faster but can result in incorrect build results!) From f903091ee20c12b000e2e51145b85997f7dc530e Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Mon, 26 Aug 2013 10:09:15 -0700 Subject: [PATCH 2/4] 8023491: Remove target names from test/Makefile and defer to sub-repo makefiles Reviewed-by: erikj --- common/makefiles/Main.gmk | 2 +- test/Makefile | 53 ++++++--------------------------------- 2 files changed, 8 insertions(+), 47 deletions(-) diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk index 1214ce56427..95db52649c1 100644 --- a/common/makefiles/Main.gmk +++ b/common/makefiles/Main.gmk @@ -183,7 +183,7 @@ bootcycle-images-only: start-make test: images test-only test-only: start-make @$(call TargetEnter) - @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true + @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true @$(call TargetExit) # Stores the tips for each repository. This file is be used when constructing the jdk image and can be diff --git a/test/Makefile b/test/Makefile index 80f0b2464eb..5bf2768859d 100644 --- a/test/Makefile +++ b/test/Makefile @@ -49,61 +49,22 @@ else \ fi endef -# Test target list for langtools repository -LANGTOOLS_TEST_LIST = langtools_jtreg - -# Test target list for jdk repository -JDK_ALL_TEST_LIST = \ - jdk_beans1 \ - jdk_io \ - jdk_lang \ - jdk_math \ - jdk_other \ - jdk_net \ - jdk_nio \ - jdk_security1 \ - jdk_text \ - jdk_util \ - jdk_time \ - jdk_awt \ - jdk_beans2 jdk_beans3 \ - jdk_management \ - jdk_jmx \ - jdk_security2 jdk_security3 \ - jdk_rmi \ - jdk_sound \ - jdk_swing \ - jdk_tools \ - jdk_jdi \ - jdk_jfr - -# Theses are meta test targets in jdk -JDK_META_TEST_LIST = jdk_all jdk_default jdk_core - -# These are the current jck test targets in the jdk repository -JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime - # Default test target (core) -default: jdk_core $(LANGTOOLS_TEST_LIST) +default: jdk_core langtools_jtreg # All testing -all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST) +all: jdk_all langtools_all # Test targets -$(LANGTOOLS_TEST_LIST): - @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) +langtools_% : + @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_OUTPUT_DIR=$(ALT_OUTPUTDIR)/testoutput/langtools/jtreg JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) -$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST): - @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) - -clean: +jdk_% : + @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@) ################################################################ # Phony targets (e.g. these are not filenames) -.PHONY: all clean \ - $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \ - $(LANGTOOLS_TEST_LIST) +.PHONY: all clean ################################################################ - From 50b27ec15a1ab2ac3413fcba2a54d462443c0c46 Mon Sep 17 00:00:00 2001 From: Christine Lu Date: Thu, 29 Aug 2013 09:41:46 -0700 Subject: [PATCH 3/4] Added tag jdk8-b105 for changeset e164aa20de40 --- .hgtags-top-repo | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 93bd4b7ecc3..505ac39fd54 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -226,3 +226,4 @@ d2dcb110e9dbaf9903c05b211df800e78e4b394e jdk8-b100 5eb3c1dc348f72a7f84f7d9d07834e8bbe09a799 jdk8-b102 b7e64be81c8a7690703df5711f4fc2375da8a9cb jdk8-b103 96c1b9b7524b52c3fcefc90ffad4c767396727c8 jdk8-b104 +5166118c59178b5d31001bc4058e92486ee07d9b jdk8-b105 From 3c108d65ed07325bb0141ed15ee11e91051cf1a3 Mon Sep 17 00:00:00 2001 From: Mike Duigou Date: Thu, 29 Aug 2013 16:04:14 -0700 Subject: [PATCH 4/4] 8023892: test/Makefile shouldn't try to tell langtools/test/Makefile where to put output Reviewed-by: erikj, vromero, henryjen --- test/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Makefile b/test/Makefile index 5bf2768859d..af84275fd8f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -57,7 +57,7 @@ all: jdk_all langtools_all # Test targets langtools_% : - @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_OUTPUT_DIR=$(ALT_OUTPUTDIR)/testoutput/langtools/jtreg JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) + @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@)) jdk_% : @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)