Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/makefiles/Main.gmk	Wed Feb 06 11:09:24 2013 -0800
     1.2 +++ b/common/makefiles/Main.gmk	Wed Feb 06 11:12:46 2013 -0800
     1.3 @@ -160,7 +160,7 @@
     1.4  
     1.5  test: start-make
     1.6  	@$(call TargetEnter)
     1.7 -	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) MAKEFLAGS= -j1 PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(TEST)) || true
     1.8 +	@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= PRODUCT_HOME=$(OUTPUT_ROOT)/jdk JPRT_JAVA_HOME=$(OUTPUT_ROOT)/jdk ALT_OUTPUTDIR=$(OUTPUT_ROOT) $(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	Wed Feb 06 11:09:24 2013 -0800
     2.2 +++ b/test/Makefile	Wed Feb 06 11:12:46 2013 -0800
     2.3 @@ -38,8 +38,8 @@
     2.4  define SUBDIR_TEST # subdirectory target
     2.5  if [ -d $1 ] ; then \
     2.6    if [ -r $1/test/Makefile ] ; then \
     2.7 -    echo "$(MAKE) -C $1/test $2" ; \
     2.8 -    $(MAKE) -C $1/test $2 ; \
     2.9 +    echo "$(MAKE) -k -C $1/test $2" ; \
    2.10 +    $(MAKE) -k -C $1/test $2 ; \
    2.11    else \
    2.12      echo "ERROR: File does not exist: $1/test/Makefile"; \
    2.13      exit 1; \
    2.14 @@ -53,7 +53,7 @@
    2.15  LANGTOOLS_TEST_LIST = langtools_jtreg
    2.16  
    2.17  # Test target list for jdk repository
    2.18 -JDK_DEFAULT_TEST_LIST = \
    2.19 +JDK_ALL_TEST_LIST = \
    2.20  	jdk_beans1 \
    2.21  	jdk_io  \
    2.22  	jdk_lang  \
    2.23 @@ -64,10 +64,7 @@
    2.24  	jdk_security1 \
    2.25  	jdk_text  \
    2.26  	jdk_util  \
    2.27 -	jdk_time
    2.28 -
    2.29 -# These tests are not part of the default testing list
    2.30 -JDK_NONDEFAULT_TEST_LIST = \
    2.31 +	jdk_time \
    2.32  	jdk_awt \
    2.33  	jdk_beans2 jdk_beans3  \
    2.34  	jdk_management \
    2.35 @@ -80,14 +77,14 @@
    2.36  	jdk_jdi \
    2.37  	jdk_jfr
    2.38  
    2.39 -# All jdk tests
    2.40 -JDK_ALL_TEST_LIST = $(JDK_DEFAULT_TEST_LIST) $(JDK_NONDEFAULT_TEST_LIST)
    2.41 +# Theses are meta test targets in jdk
    2.42 +JDK_META_TEST_LIST = jdk_all jdk_default jdk_core
    2.43  
    2.44  # These are the current jck test targets in the jdk repository
    2.45  JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
    2.46  
    2.47 -# Default test target (everything)
    2.48 -default: $(JDK_DEFAULT_TEST_LIST) $(LANGTOOLS_TEST_LIST)
    2.49 +# Default test target (core)
    2.50 +default: jdk_core $(LANGTOOLS_TEST_LIST)
    2.51  
    2.52  # All testing
    2.53  all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST)
    2.54 @@ -95,7 +92,8 @@
    2.55  # Test targets
    2.56  $(LANGTOOLS_TEST_LIST):
    2.57  	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
    2.58 -$(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST):
    2.59 +
    2.60 +$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST):
    2.61  	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
    2.62  
    2.63  clean:
    2.64 @@ -104,7 +102,7 @@
    2.65  
    2.66  # Phony targets (e.g. these are not filenames)
    2.67  .PHONY: all clean \
    2.68 -        $(JDK_ALL_TEST_LIST) $(JDK_JCK7_LIST) \
    2.69 +        $(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \
    2.70          $(LANGTOOLS_TEST_LIST)
    2.71  
    2.72  ################################################################