Merge
authorerikj
Wed, 04 Sep 2013 10:37:21 +0200
changeset 19528 8b941e6b5552
parent 19527 0de984f85e10 (current diff)
parent 19526 fedd6fc8aef6 (diff)
child 19563 705fd2acf5a9
Merge
NewMakefile.gmk
common/makefiles/Main.gmk
--- a/.hgtags-top-repo	Wed Sep 04 10:15:46 2013 +0200
+++ b/.hgtags-top-repo	Wed Sep 04 10:37:21 2013 +0200
@@ -226,3 +226,4 @@
 5eb3c1dc348f72a7f84f7d9d07834e8bbe09a799 jdk8-b102
 b7e64be81c8a7690703df5711f4fc2375da8a9cb jdk8-b103
 96c1b9b7524b52c3fcefc90ffad4c767396727c8 jdk8-b104
+5166118c59178b5d31001bc4058e92486ee07d9b jdk8-b105
--- a/NewMakefile.gmk	Wed Sep 04 10:15:46 2013 +0200
+++ b/NewMakefile.gmk	Wed Sep 04 10:37:21 2013 +0200
@@ -98,6 +98,7 @@
 	$(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 @@
 	$(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 <component>       # Build <component> and everything it depends on. )
 	$(info .  make <component>-only  # Build <component> only, without dependencies. This)
 	$(info .                         # is faster but can result in incorrect build results!)
--- a/common/makefiles/Main.gmk	Wed Sep 04 10:15:46 2013 +0200
+++ b/common/makefiles/Main.gmk	Wed Sep 04 10:37:21 2013 +0200
@@ -183,7 +183,7 @@
 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
--- a/test/Makefile	Wed Sep 04 10:15:46 2013 +0200
+++ b/test/Makefile	Wed Sep 04 10:37:21 2013 +0200
@@ -49,61 +49,22 @@
 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_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
 
 ################################################################
-