Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/NewMakefile.gmk	Thu Aug 29 09:41:46 2013 -0700
     1.2 +++ b/NewMakefile.gmk	Thu Aug 29 16:18:06 2013 -0700
     1.3 @@ -98,6 +98,7 @@
     1.4  	$(info .                         # corba and jdk)
     1.5  	$(info .  make all               # Compile everything, all repos and images)
     1.6  	$(info .  make images            # Create complete j2sdk and j2re images)
     1.7 +	$(info .  make docs              # Create javadocs)
     1.8  	$(info .  make overlay-images    # Create limited images for sparc 64 bit platforms)
     1.9  	$(info .  make profiles          # Create complete j2re compact profile images)
    1.10  	$(info .  make bootcycle-images  # Build images twice, second time with newly build JDK)
    1.11 @@ -109,7 +110,7 @@
    1.12  	$(info .  make test              # Run tests, default is all tests (see TEST below))
    1.13  	$(info )
    1.14  	$(info Targets for specific components)
    1.15 -	$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, images or overlay-images))
    1.16 +	$(info (Component is any of langtools, corba, jaxp, jaxws, hotspot, jdk, nashorn, images, overlay-images, docs or test))
    1.17  	$(info .  make <component>       # Build <component> and everything it depends on. )
    1.18  	$(info .  make <component>-only  # Build <component> only, without dependencies. This)
    1.19  	$(info .                         # is faster but can result in incorrect build results!)

     2.1 --- a/common/makefiles/Main.gmk	Thu Aug 29 09:41:46 2013 -0700
     2.2 +++ b/common/makefiles/Main.gmk	Thu Aug 29 16:18:06 2013 -0700
     2.3 @@ -183,7 +183,7 @@
     2.4  test: images test-only
     2.5  test-only: start-make
     2.6  	@$(call TargetEnter)
     2.7 -	@($(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
     2.8 +	@($(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
     2.9  	@$(call TargetExit)
    2.10  
    2.11  # Stores the tips for each repository. This file is be used when constructing the jdk image and can be

     3.1 --- a/test/Makefile	Thu Aug 29 09:41:46 2013 -0700
     3.2 +++ b/test/Makefile	Thu Aug 29 16:18:06 2013 -0700
     3.3 @@ -49,61 +49,22 @@
     3.4  fi
     3.5  endef
     3.6  
     3.7 -# Test target list for langtools repository
     3.8 -LANGTOOLS_TEST_LIST = langtools_jtreg
     3.9 -
    3.10 -# Test target list for jdk repository
    3.11 -JDK_ALL_TEST_LIST = \
    3.12 -	jdk_beans1 \
    3.13 -	jdk_io  \
    3.14 -	jdk_lang  \
    3.15 -	jdk_math  \
    3.16 -	jdk_other  \
    3.17 -	jdk_net  \
    3.18 -	jdk_nio \
    3.19 -	jdk_security1 \
    3.20 -	jdk_text  \
    3.21 -	jdk_util  \
    3.22 -	jdk_time \
    3.23 -	jdk_awt \
    3.24 -	jdk_beans2 jdk_beans3  \
    3.25 -	jdk_management \
    3.26 -	jdk_jmx \
    3.27 -	jdk_security2 jdk_security3  \
    3.28 -	jdk_rmi \
    3.29 -	jdk_sound \
    3.30 -	jdk_swing \
    3.31 -	jdk_tools \
    3.32 -	jdk_jdi \
    3.33 -	jdk_jfr
    3.34 -
    3.35 -# Theses are meta test targets in jdk
    3.36 -JDK_META_TEST_LIST = jdk_all jdk_default jdk_core
    3.37 -
    3.38 -# These are the current jck test targets in the jdk repository
    3.39 -JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
    3.40 -
    3.41  # Default test target (core)
    3.42 -default: jdk_core $(LANGTOOLS_TEST_LIST)
    3.43 +default: jdk_core langtools_jtreg
    3.44  
    3.45  # All testing
    3.46 -all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST)
    3.47 +all: jdk_all langtools_all
    3.48  
    3.49  # Test targets
    3.50 -$(LANGTOOLS_TEST_LIST):
    3.51 -	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
    3.52 +langtools_% :
    3.53 +	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
    3.54  
    3.55 -$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST):
    3.56 -	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
    3.57 -
    3.58 -clean:
    3.59 +jdk_% :
    3.60 +	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)
    3.61  
    3.62  ################################################################
    3.63  
    3.64  # Phony targets (e.g. these are not filenames)
    3.65 -.PHONY: all clean \
    3.66 -        $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \
    3.67 -        $(LANGTOOLS_TEST_LIST)
    3.68 +.PHONY: all clean
    3.69  
    3.70  ################################################################
    3.71 -