Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/makefiles/Main.gmk	Tue Aug 20 17:44:35 2013 -0700
     1.2 +++ b/common/makefiles/Main.gmk	Mon Aug 26 10:09:15 2013 -0700
     1.3 @@ -183,7 +183,7 @@
     1.4  test: images test-only
     1.5  test-only: start-make
     1.6  	@$(call TargetEnter)
     1.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
     1.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
     1.9  	@$(call TargetExit)
    1.10  
    1.11  # Stores the tips for each repository. This file is be used when constructing the jdk image and can be

     2.1 --- a/test/Makefile	Tue Aug 20 17:44:35 2013 -0700
     2.2 +++ b/test/Makefile	Mon Aug 26 10:09:15 2013 -0700
     2.3 @@ -49,61 +49,22 @@
     2.4  fi
     2.5  endef
     2.6  
     2.7 -# Test target list for langtools repository
     2.8 -LANGTOOLS_TEST_LIST = langtools_jtreg
     2.9 -
    2.10 -# Test target list for jdk repository
    2.11 -JDK_ALL_TEST_LIST = \
    2.12 -	jdk_beans1 \
    2.13 -	jdk_io  \
    2.14 -	jdk_lang  \
    2.15 -	jdk_math  \
    2.16 -	jdk_other  \
    2.17 -	jdk_net  \
    2.18 -	jdk_nio \
    2.19 -	jdk_security1 \
    2.20 -	jdk_text  \
    2.21 -	jdk_util  \
    2.22 -	jdk_time \
    2.23 -	jdk_awt \
    2.24 -	jdk_beans2 jdk_beans3  \
    2.25 -	jdk_management \
    2.26 -	jdk_jmx \
    2.27 -	jdk_security2 jdk_security3  \
    2.28 -	jdk_rmi \
    2.29 -	jdk_sound \
    2.30 -	jdk_swing \
    2.31 -	jdk_tools \
    2.32 -	jdk_jdi \
    2.33 -	jdk_jfr
    2.34 -
    2.35 -# Theses are meta test targets in jdk
    2.36 -JDK_META_TEST_LIST = jdk_all jdk_default jdk_core
    2.37 -
    2.38 -# These are the current jck test targets in the jdk repository
    2.39 -JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
    2.40 -
    2.41  # Default test target (core)
    2.42 -default: jdk_core $(LANGTOOLS_TEST_LIST)
    2.43 +default: jdk_core langtools_jtreg
    2.44  
    2.45  # All testing
    2.46 -all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST)
    2.47 +all: jdk_all langtools_all
    2.48  
    2.49  # Test targets
    2.50 -$(LANGTOOLS_TEST_LIST):
    2.51 -	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
    2.52 +langtools_% :
    2.53 +	@$(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_,,$@))
    2.54  
    2.55 -$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST):
    2.56 -	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
    2.57 -
    2.58 -clean:
    2.59 +jdk_% :
    2.60 +	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)
    2.61  
    2.62  ################################################################
    2.63  
    2.64  # Phony targets (e.g. these are not filenames)
    2.65 -.PHONY: all clean \
    2.66 -        $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \
    2.67 -        $(LANGTOOLS_TEST_LIST)
    2.68 +.PHONY: all clean
    2.69  
    2.70  ################################################################
    2.71 -