Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/make/jprt.properties	Thu Mar 17 14:32:38 2011 -0700
     1.2 +++ b/make/jprt.properties	Tue Mar 22 11:07:40 2011 -0700
     1.3 @@ -323,6 +323,21 @@
     1.4      ${jprt.my.windows.i586}-product-c1-jdk_tools2, 		\
     1.5      windows_x64_5.2-product-c2-jdk_tools2
     1.6  
     1.7 +# JCK test targets in test/Makefile (no fastdebug & limited c2, windows broken)
     1.8 +jprt.my.jck.test.target.set=					\
     1.9 +    solaris_sparc_5.10-product-c1-JCK7TESTRULE, 		\
    1.10 +    solaris_sparcv9_5.10-product-c2-JCK7TESTRULE, 		\
    1.11 +    solaris_i586_5.10-product-c1-JCK7TESTRULE, 			\
    1.12 +    solaris_x64_5.10-product-c2-JCK7TESTRULE, 			\
    1.13 +    linux_i586_2.6-product-c1-JCK7TESTRULE, 			\
    1.14 +    linux_x64_2.6-product-c2-JCK7TESTRULE
    1.15 +
    1.16 +# JCK testset targets (e.g. jprt submit -testset jck ... )
    1.17 +jprt.make.rule.jck.test.targets=				\
    1.18 +    ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7devtools},   \
    1.19 +    ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7runtime},    \
    1.20 +    ${jprt.my.jck.test.target.set:JCK7TESTRULE=jck7compiler}
    1.21 +
    1.22  # Select list to use (allow for testset to be empty too)
    1.23  jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets} 
    1.24  jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets} 
    1.25 @@ -333,4 +348,3 @@
    1.26  # Directories to be excluded from the source bundles
    1.27  jprt.bundle.exclude.src.dirs=build dist webrev
    1.28  
    1.29 -

     2.1 --- a/test/Makefile	Thu Mar 17 14:32:38 2011 -0700
     2.2 +++ b/test/Makefile	Tue Mar 22 11:07:40 2011 -0700
     2.3 @@ -73,13 +73,16 @@
     2.4  	jdk_rmi \
     2.5  	jdk_swing
     2.6  
     2.7 +# These are the current jck test targets in the jdk repository
     2.8 +JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
     2.9 +
    2.10  # Default test target (everything)
    2.11  all: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
    2.12  
    2.13  # Test targets
    2.14  $(LANGTOOLS_TEST_LIST):
    2.15  	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
    2.16 -$(JDK_TEST_LIST) $(JDK_TEST_LIST2):
    2.17 +$(JDK_TEST_LIST) $(JDK_TEST_LIST2) $(JDK_JCK7_LIST):
    2.18  	@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@)
    2.19  
    2.20  clean:
    2.21 @@ -87,7 +90,9 @@
    2.22  ################################################################
    2.23  
    2.24  # Phony targets (e.g. these are not filenames)
    2.25 -.PHONY: all clean $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
    2.26 +.PHONY: all clean \
    2.27 +        $(JDK_TEST_LIST) $(JDK_TEST_LIST2) $(JDK_JCK7_LIST) \
    2.28 +        $(LANGTOOLS_TEST_LIST)
    2.29  
    2.30  ################################################################
    2.31