jdk8-mips64-public: changeset 243:734a599c6ffc

     1.1 --- a/Makefile	Fri Oct 08 11:43:33 2010 -0400
     1.2 +++ b/Makefile	Thu Oct 14 16:44:10 2010 -0700
     1.3 @@ -558,9 +558,12 @@
     1.4  # rule to test
     1.5  ################################################################
     1.6  
     1.7 -.NOTPARALLEL: test
     1.8 +.NOTPARALLEL: test_run
     1.9  
    1.10 -test: test_clean test_start test_summary
    1.11 +test:
    1.12 +	$(MAKE) test_run
    1.13 +
    1.14 +test_run: test_clean test_start test_summary
    1.15  
    1.16  test_start:
    1.17  	@$(ECHO) "Tests started at `$(DATE)`"
    1.18 @@ -586,7 +589,7 @@
    1.19  # Get failure list from log
    1.20  $(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt
    1.21  	@$(RM) $@
    1.22 -	@( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) > $@
    1.23 +	@( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) | $(NAWK) 'length>0' > $@
    1.24  
    1.25  # Get log file of all tests run
    1.26  JDK_TO_TEST := $(shell 							\
    1.27 @@ -598,10 +601,11 @@
    1.28      $(ECHO) "$(PRODUCT_HOME)"; 						\
    1.29    fi 									\
    1.30  )
    1.31 +TEST_TARGETS=all
    1.32  $(OUTPUTDIR)/test_log.txt:
    1.33  	$(RM) $@
    1.34 -	( $(CD) test &&                                     \
    1.35 -          $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) \
    1.36 +	( $(CD) test &&                                                     \
    1.37 +          $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) $(TEST_TARGETS) \
    1.38          ) | tee $@
    1.39  
    1.40  ################################################################
    1.41 @@ -614,7 +618,7 @@
    1.42  #  PHONY
    1.43  ################################################################
    1.44  
    1.45 -.PHONY: all  test test_start test_summary test_clean \
    1.46 +.PHONY: all  test test_run test_start test_summary test_clean \
    1.47  	generic_build_repo_series \
    1.48  	what clobber insane \
    1.49          dev dev-build dev-sanity dev-clobber \

     2.1 --- a/make/jprt.properties	Fri Oct 08 11:43:33 2010 -0400
     2.2 +++ b/make/jprt.properties	Thu Oct 14 16:44:10 2010 -0700
     2.3 @@ -25,49 +25,310 @@
     2.4  
     2.5  # Properties for jprt
     2.6  
     2.7 -# Use whatever release that the submitted job requests
     2.8 +# At submit time, the release supplied will be in jprt.submit.release
     2.9 +#    and will be one of the official release names defined in jprt.
    2.10 +#    jprt supports property value expansion using ${property.name} syntax.
    2.11 +
    2.12 +# This tells jprt what default release we want to build
    2.13  jprt.tools.default.release=${jprt.submit.release}
    2.14  
    2.15  # The different build flavors we want, we override here so we just get these 2
    2.16  jprt.build.flavors=product,fastdebug
    2.17  
    2.18 -# Shortened list of vm tests
    2.19 -jprt.test.targets=              \
    2.20 -  *-product-*-jvm98,            \
    2.21 -  *-product-*-scimark,          \
    2.22 -  *-product-*-runThese,         \
    2.23 -  *-product-*-GCBasher_default, \
    2.24 -  *-product-*-GCOld_default,    \
    2.25 -  *-product-*-jbb_default
    2.26 +# Define the Windows we want (temporary)
    2.27 +jprt.my.windows.i586.jdk7b107=windows_i586_5.0
    2.28 +jprt.my.windows.i586.jdk7temp=windows_i586_5.0
    2.29 +jprt.my.windows.i586.jdk7=windows_i586_5.1
    2.30 +jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}}
    2.31  
    2.32 -# Test targets in test/Makefile
    2.33 -jprt.make.rule.test.targets=   \
    2.34 -  *-product-*-langtools_jtreg, \
    2.35 -  *-product-*-jdk_beans1,      \
    2.36 -  *-product-*-jdk_beans2,      \
    2.37 -  *-product-*-jdk_beans3,      \
    2.38 -  *-product-*-jdk_io,          \
    2.39 -  *-product-*-jdk_lang,        \
    2.40 -  *-product-*-jdk_management1, \
    2.41 -  *-product-*-jdk_management2, \
    2.42 -  *-product-*-jdk_math,        \
    2.43 -  *-product-*-jdk_misc,        \
    2.44 -  *-product-*-jdk_net,         \
    2.45 -  *-product-*-jdk_nio1,        \
    2.46 -  *-product-*-jdk_nio2,        \
    2.47 -  *-product-*-jdk_nio3,        \
    2.48 -  *-product-*-jdk_security1,   \
    2.49 -  *-product-*-jdk_security2,   \
    2.50 -  *-product-*-jdk_security3,   \
    2.51 -  *-product-*-jdk_text,        \
    2.52 -  *-product-*-jdk_tools1,      \
    2.53 -  *-product-*-jdk_tools2,      \
    2.54 -  *-product-*-jdk_util
    2.55 +# Standard list of jprt build targets for this source tree
    2.56 +jprt.build.targets= 						\
    2.57 +    solaris_sparc_5.10-{product|fastdebug}, 			\
    2.58 +    solaris_sparcv9_5.10-{product|fastdebug}, 			\
    2.59 +    solaris_i586_5.10-{product|fastdebug}, 			\
    2.60 +    solaris_x64_5.10-{product|fastdebug}, 			\
    2.61 +    linux_i586_2.6-{product|fastdebug}, 			\
    2.62 +    linux_x64_2.6-{product|fastdebug}, 				\
    2.63 +    ${jprt.my.windows.i586}-{product|fastdebug}, 		\
    2.64 +    windows_x64_5.2-{product|fastdebug}
    2.65  
    2.66 -# Not Ready Yet:
    2.67 -#   *-product-*-jdk_awt
    2.68 -#   *-product-*-jdk_rmi
    2.69 -#   *-product-*-jdk_swing
    2.70 +# User can select the test set with jprt submit "-testset name" option
    2.71 +jprt.my.test.set=${jprt.test.set}
    2.72 +
    2.73 +# Default vm test targets (no fastdebug & limited c2 testing)
    2.74 +jprt.vm.default.test.targets=              			\
    2.75 +    								\
    2.76 +    solaris_sparc_5.10-product-c1-jvm98, 			\
    2.77 +    solaris_sparcv9_5.10-product-c2-jvm98, 			\
    2.78 +    solaris_i586_5.10-product-c1-jvm98, 			\
    2.79 +    solaris_x64_5.10-product-c2-jvm98, 				\
    2.80 +    linux_i586_2.6-product-{c1|c2}-jvm98, 			\
    2.81 +    linux_x64_2.6-product-c2-jvm98, 				\
    2.82 +    ${jprt.my.windows.i586}-product-c1-jvm98, 			\
    2.83 +    windows_x64_5.2-product-c2-jvm98, 				\
    2.84 +    								\
    2.85 +    solaris_sparc_5.10-product-c1-scimark, 			\
    2.86 +    solaris_sparcv9_5.10-product-c2-scimark, 			\
    2.87 +    solaris_i586_5.10-product-c1-scimark, 			\
    2.88 +    solaris_x64_5.10-product-c2-scimark, 			\
    2.89 +    linux_i586_2.6-product-{c1|c2}-scimark, 			\
    2.90 +    linux_x64_2.6-product-c2-scimark, 				\
    2.91 +    ${jprt.my.windows.i586}-product-c1-scimark, 		\
    2.92 +    windows_x64_5.2-product-c2-scimark
    2.93 +
    2.94 +# Default jdk test targets in test/Makefile (no fastdebug & limited c2 testing)
    2.95 +jprt.make.rule.default.test.targets=				\
    2.96 +    								\
    2.97 +    solaris_sparc_5.10-product-c1-langtools_jtreg, 		\
    2.98 +    solaris_sparcv9_5.10-product-c2-langtools_jtreg, 		\
    2.99 +    solaris_i586_5.10-product-c1-langtools_jtreg, 		\
   2.100 +    solaris_x64_5.10-product-c2-langtools_jtreg, 		\
   2.101 +    linux_i586_2.6-product-{c1|c2}-langtools_jtreg, 		\
   2.102 +    linux_x64_2.6-product-c2-langtools_jtreg, 			\
   2.103 +    ${jprt.my.windows.i586}-product-c1-langtools_jtreg, 	\
   2.104 +    windows_x64_5.2-product-c2-langtools_jtreg, 		\
   2.105 +    								\
   2.106 +    solaris_sparc_5.10-product-c1-jdk_beans1, 			\
   2.107 +    solaris_sparcv9_5.10-product-c2-jdk_beans1, 		\
   2.108 +    solaris_i586_5.10-product-c1-jdk_beans1, 			\
   2.109 +    solaris_x64_5.10-product-c2-jdk_beans1, 			\
   2.110 +    linux_i586_2.6-product-{c1|c2}-jdk_beans1, 			\
   2.111 +    linux_x64_2.6-product-c2-jdk_beans1, 			\
   2.112 +    ${jprt.my.windows.i586}-product-c1-jdk_beans1, 		\
   2.113 +    windows_x64_5.2-product-c2-jdk_beans1, 			\
   2.114 +    								\
   2.115 +    solaris_sparc_5.10-product-c1-jdk_io, 			\
   2.116 +    solaris_sparcv9_5.10-product-c2-jdk_io, 			\
   2.117 +    solaris_i586_5.10-product-c1-jdk_io, 			\
   2.118 +    solaris_x64_5.10-product-c2-jdk_io, 			\
   2.119 +    linux_i586_2.6-product-{c1|c2}-jdk_io, 			\
   2.120 +    linux_x64_2.6-product-c2-jdk_io, 				\
   2.121 +    ${jprt.my.windows.i586}-product-c1-jdk_io, 			\
   2.122 +    windows_x64_5.2-product-c2-jdk_io, 				\
   2.123 +    								\
   2.124 +    solaris_sparc_5.10-product-c1-jdk_lang, 			\
   2.125 +    solaris_sparcv9_5.10-product-c2-jdk_lang, 			\
   2.126 +    solaris_i586_5.10-product-c1-jdk_lang, 			\
   2.127 +    solaris_x64_5.10-product-c2-jdk_lang, 			\
   2.128 +    linux_i586_2.6-product-{c1|c2}-jdk_lang, 			\
   2.129 +    linux_x64_2.6-product-c2-jdk_lang, 				\
   2.130 +    ${jprt.my.windows.i586}-product-c1-jdk_lang, 		\
   2.131 +    windows_x64_5.2-product-c2-jdk_lang, 			\
   2.132 +    								\
   2.133 +    solaris_sparc_5.10-product-c1-jdk_math, 			\
   2.134 +    solaris_sparcv9_5.10-product-c2-jdk_math, 			\
   2.135 +    solaris_i586_5.10-product-c1-jdk_math, 			\
   2.136 +    solaris_x64_5.10-product-c2-jdk_math, 			\
   2.137 +    linux_i586_2.6-product-{c1|c2}-jdk_math, 			\
   2.138 +    linux_x64_2.6-product-c2-jdk_math, 				\
   2.139 +    ${jprt.my.windows.i586}-product-c1-jdk_math, 		\
   2.140 +    windows_x64_5.2-product-c2-jdk_math, 			\
   2.141 +    								\
   2.142 +    solaris_sparc_5.10-product-c1-jdk_misc, 			\
   2.143 +    solaris_sparcv9_5.10-product-c2-jdk_misc, 			\
   2.144 +    solaris_i586_5.10-product-c1-jdk_misc, 			\
   2.145 +    solaris_x64_5.10-product-c2-jdk_misc, 			\
   2.146 +    linux_i586_2.6-product-{c1|c2}-jdk_misc, 			\
   2.147 +    linux_x64_2.6-product-c2-jdk_misc, 				\
   2.148 +    ${jprt.my.windows.i586}-product-c1-jdk_misc, 		\
   2.149 +    windows_x64_5.2-product-c2-jdk_misc, 			\
   2.150 +    								\
   2.151 +    solaris_sparc_5.10-product-c1-jdk_net, 			\
   2.152 +    solaris_sparcv9_5.10-product-c2-jdk_net, 			\
   2.153 +    solaris_i586_5.10-product-c1-jdk_net, 			\
   2.154 +    solaris_x64_5.10-product-c2-jdk_net, 			\
   2.155 +    linux_i586_2.6-product-{c1|c2}-jdk_net, 			\
   2.156 +    linux_x64_2.6-product-c2-jdk_net, 				\
   2.157 +    ${jprt.my.windows.i586}-product-c1-jdk_net, 		\
   2.158 +    windows_x64_5.2-product-c2-jdk_net, 			\
   2.159 +    								\
   2.160 +    solaris_sparc_5.10-product-c1-jdk_nio1, 			\
   2.161 +    solaris_sparcv9_5.10-product-c2-jdk_nio1, 			\
   2.162 +    solaris_i586_5.10-product-c1-jdk_nio1, 			\
   2.163 +    solaris_x64_5.10-product-c2-jdk_nio1, 			\
   2.164 +    linux_i586_2.6-product-{c1|c2}-jdk_nio1, 			\
   2.165 +    linux_x64_2.6-product-c2-jdk_nio1, 				\
   2.166 +    ${jprt.my.windows.i586}-product-c1-jdk_nio1, 		\
   2.167 +    windows_x64_5.2-product-c2-jdk_nio1, 			\
   2.168 +    								\
   2.169 +    solaris_sparc_5.10-product-c1-jdk_nio2, 			\
   2.170 +    solaris_sparcv9_5.10-product-c2-jdk_nio2, 			\
   2.171 +    solaris_i586_5.10-product-c1-jdk_nio2, 			\
   2.172 +    solaris_x64_5.10-product-c2-jdk_nio2, 			\
   2.173 +    linux_i586_2.6-product-{c1|c2}-jdk_nio2, 			\
   2.174 +    linux_x64_2.6-product-c2-jdk_nio2, 				\
   2.175 +    ${jprt.my.windows.i586}-product-c1-jdk_nio2, 		\
   2.176 +    windows_x64_5.2-product-c2-jdk_nio2, 			\
   2.177 +    								\
   2.178 +    solaris_sparc_5.10-product-c1-jdk_nio3, 			\
   2.179 +    solaris_sparcv9_5.10-product-c2-jdk_nio3, 			\
   2.180 +    solaris_i586_5.10-product-c1-jdk_nio3, 			\
   2.181 +    solaris_x64_5.10-product-c2-jdk_nio3, 			\
   2.182 +    linux_i586_2.6-product-{c1|c2}-jdk_nio3, 			\
   2.183 +    linux_x64_2.6-product-c2-jdk_nio3, 				\
   2.184 +    ${jprt.my.windows.i586}-product-c1-jdk_nio3, 		\
   2.185 +    windows_x64_5.2-product-c2-jdk_nio3, 			\
   2.186 +    								\
   2.187 +    solaris_sparc_5.10-product-c1-jdk_security1, 		\
   2.188 +    solaris_sparcv9_5.10-product-c2-jdk_security1, 		\
   2.189 +    solaris_i586_5.10-product-c1-jdk_security1, 		\
   2.190 +    solaris_x64_5.10-product-c2-jdk_security1, 			\
   2.191 +    linux_i586_2.6-product-{c1|c2}-jdk_security1, 		\
   2.192 +    linux_x64_2.6-product-c2-jdk_security1, 			\
   2.193 +    ${jprt.my.windows.i586}-product-c1-jdk_security1, 		\
   2.194 +    windows_x64_5.2-product-c2-jdk_security1, 			\
   2.195 +    								\
   2.196 +    solaris_sparc_5.10-product-c1-jdk_text, 			\
   2.197 +    solaris_sparcv9_5.10-product-c2-jdk_text, 			\
   2.198 +    solaris_i586_5.10-product-c1-jdk_text, 			\
   2.199 +    solaris_x64_5.10-product-c2-jdk_text, 			\
   2.200 +    linux_i586_2.6-product-{c1|c2}-jdk_text, 			\
   2.201 +    linux_x64_2.6-product-c2-jdk_text, 				\
   2.202 +    ${jprt.my.windows.i586}-product-c1-jdk_text, 		\
   2.203 +    windows_x64_5.2-product-c2-jdk_text, 			\
   2.204 +    								\
   2.205 +    solaris_sparc_5.10-product-c1-jdk_tools1, 			\
   2.206 +    solaris_sparcv9_5.10-product-c2-jdk_tools1, 		\
   2.207 +    solaris_i586_5.10-product-c1-jdk_tools1, 			\
   2.208 +    solaris_x64_5.10-product-c2-jdk_tools1, 			\
   2.209 +    linux_i586_2.6-product-{c1|c2}-jdk_tools1, 			\
   2.210 +    linux_x64_2.6-product-c2-jdk_tools1, 			\
   2.211 +    ${jprt.my.windows.i586}-product-c1-jdk_tools1, 		\
   2.212 +    windows_x64_5.2-product-c2-jdk_tools1, 			\
   2.213 +    								\
   2.214 +    solaris_sparc_5.10-product-c1-jdk_util, 			\
   2.215 +    solaris_sparcv9_5.10-product-c2-jdk_util, 			\
   2.216 +    solaris_i586_5.10-product-c1-jdk_util, 			\
   2.217 +    solaris_x64_5.10-product-c2-jdk_util, 			\
   2.218 +    linux_i586_2.6-product-{c1|c2}-jdk_util, 			\
   2.219 +    linux_x64_2.6-product-c2-jdk_util, 				\
   2.220 +    ${jprt.my.windows.i586}-product-c1-jdk_util, 		\
   2.221 +    windows_x64_5.2-product-c2-jdk_util
   2.222 +
   2.223 +# All vm test targets (but still no fastdebug & limited c2 testing)
   2.224 +jprt.vm.all.test.targets=    					\
   2.225 +    								\
   2.226 +   ${jprt.vm.default.test.targets}, 				\
   2.227 +    								\
   2.228 +    solaris_sparc_5.10-product-c1-runThese, 			\
   2.229 +    solaris_sparcv9_5.10-product-c2-runThese, 			\
   2.230 +    solaris_i586_5.10-product-c1-runThese, 			\
   2.231 +    solaris_x64_5.10-product-c2-runThese, 			\
   2.232 +    linux_i586_2.6-product-{c1|c2}-runThese, 			\
   2.233 +    linux_x64_2.6-product-c2-runThese, 				\
   2.234 +    ${jprt.my.windows.i586}-product-c1-runThese, 		\
   2.235 +    windows_x64_5.2-product-c2-runThese, 			\
   2.236 +    								\
   2.237 +    solaris_sparc_5.10-product-c1-jbb_default, 			\
   2.238 +    solaris_sparcv9_5.10-product-c2-jbb_default, 		\
   2.239 +    solaris_i586_5.10-product-c1-jbb_default, 			\
   2.240 +    solaris_x64_5.10-product-c2-jbb_default, 			\
   2.241 +    linux_i586_2.6-product-{c1|c2}-jbb_default, 		\
   2.242 +    linux_x64_2.6-product-c2-jbb_default, 			\
   2.243 +    ${jprt.my.windows.i586}-product-c1-jbb_default, 		\
   2.244 +    windows_x64_5.2-product-c2-jbb_default
   2.245 +
   2.246 +# All jdk test targets (but still no fastdebug & limited c2 testing)
   2.247 +jprt.make.rule.all.test.targets=    				\
   2.248 +    								\
   2.249 +   ${jprt.make.rule.default.test.targets}, 			\
   2.250 +    								\
   2.251 +    solaris_sparc_5.10-product-c1-jdk_awt, 			\
   2.252 +    solaris_sparcv9_5.10-product-c2-jdk_awt, 			\
   2.253 +    solaris_i586_5.10-product-c1-jdk_awt, 			\
   2.254 +    solaris_x64_5.10-product-c2-jdk_awt, 			\
   2.255 +    linux_i586_2.6-product-{c1|c2}-jdk_awt, 			\
   2.256 +    linux_x64_2.6-product-c2-jdk_awt, 				\
   2.257 +    ${jprt.my.windows.i586}-product-c1-jdk_awt, 		\
   2.258 +    windows_x64_5.2-product-c2-jdk_awt, 			\
   2.259 +    								\
   2.260 +    solaris_sparc_5.10-product-c1-jdk_beans2, 			\
   2.261 +    solaris_sparcv9_5.10-product-c2-jdk_beans2, 		\
   2.262 +    solaris_i586_5.10-product-c1-jdk_beans2, 			\
   2.263 +    solaris_x64_5.10-product-c2-jdk_beans2, 			\
   2.264 +    linux_i586_2.6-product-{c1|c2}-jdk_beans2, 			\
   2.265 +    linux_x64_2.6-product-c2-jdk_beans2, 			\
   2.266 +    ${jprt.my.windows.i586}-product-c1-jdk_beans2, 		\
   2.267 +    windows_x64_5.2-product-c2-jdk_beans2, 			\
   2.268 +    								\
   2.269 +    solaris_sparc_5.10-product-c1-jdk_beans3, 			\
   2.270 +    solaris_sparcv9_5.10-product-c2-jdk_beans3, 		\
   2.271 +    solaris_i586_5.10-product-c1-jdk_beans3, 			\
   2.272 +    solaris_x64_5.10-product-c2-jdk_beans3, 			\
   2.273 +    linux_i586_2.6-product-{c1|c2}-jdk_beans3, 			\
   2.274 +    linux_x64_2.6-product-c2-jdk_beans3, 			\
   2.275 +    ${jprt.my.windows.i586}-product-c1-jdk_beans3, 		\
   2.276 +    windows_x64_5.2-product-c2-jdk_beans3, 			\
   2.277 +    								\
   2.278 +    solaris_sparc_5.10-product-c1-jdk_management1, 		\
   2.279 +    solaris_sparcv9_5.10-product-c2-jdk_management1, 		\
   2.280 +    solaris_i586_5.10-product-c1-jdk_management1, 		\
   2.281 +    solaris_x64_5.10-product-c2-jdk_management1, 		\
   2.282 +    linux_i586_2.6-product-{c1|c2}-jdk_management1, 		\
   2.283 +    linux_x64_2.6-product-c2-jdk_management1, 			\
   2.284 +    ${jprt.my.windows.i586}-product-c1-jdk_management1, 	\
   2.285 +    windows_x64_5.2-product-c2-jdk_management1, 		\
   2.286 +    								\
   2.287 +    solaris_sparc_5.10-product-c1-jdk_management2, 		\
   2.288 +    solaris_sparcv9_5.10-product-c2-jdk_management2, 		\
   2.289 +    solaris_i586_5.10-product-c1-jdk_management2, 		\
   2.290 +    solaris_x64_5.10-product-c2-jdk_management2, 		\
   2.291 +    linux_i586_2.6-product-{c1|c2}-jdk_management2, 		\
   2.292 +    linux_x64_2.6-product-c2-jdk_management2, 			\
   2.293 +    ${jprt.my.windows.i586}-product-c1-jdk_management2, 	\
   2.294 +    windows_x64_5.2-product-c2-jdk_management2, 		\
   2.295 +    								\
   2.296 +    solaris_sparc_5.10-product-c1-jdk_rmi, 			\
   2.297 +    solaris_sparcv9_5.10-product-c2-jdk_rmi, 			\
   2.298 +    solaris_i586_5.10-product-c1-jdk_rmi, 			\
   2.299 +    solaris_x64_5.10-product-c2-jdk_rmi, 			\
   2.300 +    linux_i586_2.6-product-{c1|c2}-jdk_rmi, 			\
   2.301 +    linux_x64_2.6-product-c2-jdk_rmi, 				\
   2.302 +    ${jprt.my.windows.i586}-product-c1-jdk_rmi, 		\
   2.303 +    windows_x64_5.2-product-c2-jdk_rmi, 			\
   2.304 +    								\
   2.305 +    solaris_sparc_5.10-product-c1-jdk_security2, 		\
   2.306 +    solaris_sparcv9_5.10-product-c2-jdk_security2, 		\
   2.307 +    solaris_i586_5.10-product-c1-jdk_security2, 		\
   2.308 +    solaris_x64_5.10-product-c2-jdk_security2, 			\
   2.309 +    linux_i586_2.6-product-{c1|c2}-jdk_security2, 		\
   2.310 +    linux_x64_2.6-product-c2-jdk_security2, 			\
   2.311 +    ${jprt.my.windows.i586}-product-c1-jdk_security2, 		\
   2.312 +    windows_x64_5.2-product-c2-jdk_security2, 			\
   2.313 +    								\
   2.314 +    solaris_sparc_5.10-product-c1-jdk_security3, 		\
   2.315 +    solaris_sparcv9_5.10-product-c2-jdk_security3, 		\
   2.316 +    solaris_i586_5.10-product-c1-jdk_security3, 		\
   2.317 +    solaris_x64_5.10-product-c2-jdk_security3, 			\
   2.318 +    linux_i586_2.6-product-{c1|c2}-jdk_security3, 		\
   2.319 +    linux_x64_2.6-product-c2-jdk_security3, 			\
   2.320 +    ${jprt.my.windows.i586}-product-c1-jdk_security3, 		\
   2.321 +    windows_x64_5.2-product-c2-jdk_security3, 			\
   2.322 +    								\
   2.323 +    solaris_sparc_5.10-product-c1-jdk_swing, 			\
   2.324 +    solaris_sparcv9_5.10-product-c2-jdk_swing, 			\
   2.325 +    solaris_i586_5.10-product-c1-jdk_swing, 			\
   2.326 +    solaris_x64_5.10-product-c2-jdk_swing, 			\
   2.327 +    linux_i586_2.6-product-{c1|c2}-jdk_swing, 			\
   2.328 +    linux_x64_2.6-product-c2-jdk_swing, 			\
   2.329 +    ${jprt.my.windows.i586}-product-c1-jdk_swing, 		\
   2.330 +    windows_x64_5.2-product-c2-jdk_swing, 			\
   2.331 +    								\
   2.332 +    solaris_sparc_5.10-product-c1-jdk_tools2, 			\
   2.333 +    solaris_sparcv9_5.10-product-c2-jdk_tools2, 		\
   2.334 +    solaris_i586_5.10-product-c1-jdk_tools2, 			\
   2.335 +    solaris_x64_5.10-product-c2-jdk_tools2, 			\
   2.336 +    linux_i586_2.6-product-{c1|c2}-jdk_tools2, 			\
   2.337 +    linux_x64_2.6-product-c2-jdk_tools2, 			\
   2.338 +    ${jprt.my.windows.i586}-product-c1-jdk_tools2, 		\
   2.339 +    windows_x64_5.2-product-c2-jdk_tools2
   2.340 +
   2.341 +# Select list to use (allow for testset to be empty too)
   2.342 +jprt.make.rule..test.targets=${jprt.make.rule.default.test.targets} 
   2.343 +jprt.make.rule.test.targets=${jprt.make.rule.${jprt.my.test.set}.test.targets} 
   2.344 +jprt.vm..test.targets=${jprt.vm.default.test.targets} 
   2.345 +jprt.vm.test.targets=${jprt.vm.${jprt.my.test.set}.test.targets} 
   2.346 +jprt.test.targets=${jprt.vm.test.targets} 
   2.347  
   2.348  # Directories to be excluded from the source bundles
   2.349  jprt.bundle.exclude.src.dirs=build dist webrev

Mercurial > jdk8-mips64-public / changeset

changeset

Merge