--- a/make/jprt.properties Wed Jul 05 20:26:01 2017 +0200
+++ b/make/jprt.properties Fri Apr 03 08:45:08 2015 -0700
@@ -119,6 +119,12 @@
${my.i586.default.build.configure.args} \
${jprt.productOpen.build.configure.args}
+jprt.windows_i586_6.2.build.configure.args= \
+ --with-toolchain-version=2013 \
+ ${jprt.i586.build.configure.args}
+jprt.windows_x64_6.2.build.configure.args= \
+ --with-toolchain-version=2013
+
########
#
# Build targets and options (default/jdk)
@@ -133,9 +139,9 @@
solaris_x64_5.11-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
- macosx_x64_10.7-{product|fastdebug}, \
- windows_i586_6.1-{product|fastdebug}, \
- windows_x64_6.1-{product|fastdebug}
+ macosx_x64_10.9-{product|fastdebug}, \
+ windows_i586_6.2-{product|fastdebug}, \
+ windows_x64_6.2-{product|fastdebug}
# Test target list (no fastdebug & limited c2 testing)
my.test.target.set= \
@@ -143,9 +149,9 @@
solaris_x64_5.11-product-c2-TESTNAME, \
linux_i586_2.6-product-{c1|c2}-TESTNAME, \
linux_x64_2.6-product-c2-TESTNAME, \
- macosx_x64_10.7-product-c2-TESTNAME, \
- windows_i586_6.1-product-c1-TESTNAME, \
- windows_x64_6.1-product-c2-TESTNAME
+ macosx_x64_10.9-product-c2-TESTNAME, \
+ windows_i586_6.2-product-c1-TESTNAME, \
+ windows_x64_6.2-product-c2-TESTNAME
# Default vm test targets (testset=default)
my.test.targets.default= \
@@ -255,9 +261,9 @@
solaris_x64_5.11-{product|fastdebug}, \
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
- macosx_x64_10.7-{product|fastdebug}, \
- windows_i586_6.1-{product|fastdebug}, \
- windows_x64_6.1-{product|fastdebug}, \
+ macosx_x64_10.9-{product|fastdebug}, \
+ windows_i586_6.2-{product|fastdebug}, \
+ windows_x64_6.2-{product|fastdebug}, \
solaris_x64_5.11-{debugOpen}, \
linux_x64_2.6-{productOpen}, \
${my.additional.build.targets.hotspot}
@@ -332,57 +338,57 @@
linux_x64_2.6-{product|fastdebug}-c2-jbb_ParOldGC
my.test.targets.hotspot.macosx.x64= \
- macosx_x64_10.7-{product|fastdebug}-c2-jvm98, \
- macosx_x64_10.7-{product|fastdebug}-c2-jvm98_nontiered, \
- macosx_x64_10.7-{product|fastdebug}-c2-scimark, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_SerialGC, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParallelGC, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_CMS, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_G1, \
- macosx_x64_10.7-{product|fastdebug}-c2-GCBasher_ParOldGC, \
- macosx_x64_10.7-{product|fastdebug}-c2-jbb_default_nontiered, \
- macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParallelGC, \
- macosx_x64_10.7-{product|fastdebug}-c2-jbb_G1, \
- macosx_x64_10.7-{product|fastdebug}-c2-jbb_ParOldGC
+ macosx_x64_10.9-{product|fastdebug}-c2-jvm98, \
+ macosx_x64_10.9-{product|fastdebug}-c2-jvm98_nontiered, \
+ macosx_x64_10.9-{product|fastdebug}-c2-scimark, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_SerialGC, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParallelGC, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_CMS, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_G1, \
+ macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_ParOldGC, \
+ macosx_x64_10.9-{product|fastdebug}-c2-jbb_default_nontiered, \
+ macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParallelGC, \
+ macosx_x64_10.9-{product|fastdebug}-c2-jbb_G1, \
+ macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParOldGC
my.test.targets.hotspot.windows.i586= \
- windows_i586_6.1-{product|fastdebug}-{c1|c2}-jvm98, \
- windows_i586_6.1-{product|fastdebug}-c2-jvm98_nontiered, \
- windows_i586_6.1-{product|fastdebug}-{c1|c2}-scimark, \
- windows_i586_6.1-product-{c1|c2}-runThese8, \
- windows_i586_6.1-product-{c1|c2}-runThese8_Xcomp_lang, \
- windows_i586_6.1-product-{c1|c2}-runThese8_Xcomp_vm, \
- windows_i586_6.1-fastdebug-c1-runThese8_Xshare, \
- windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
- windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
- windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
- windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
- windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
- windows_i586_6.1-{product|fastdebug}-{c1|c2}-jbb_default, \
- windows_i586_6.1-{product|fastdebug}-c2-jbb_default_nontiered, \
- windows_i586_6.1-product-{c1|c2}-jbb_ParallelGC, \
- windows_i586_6.1-product-{c1|c2}-jbb_CMS, \
- windows_i586_6.1-product-{c1|c2}-jbb_G1, \
- windows_i586_6.1-product-{c1|c2}-jbb_ParOldGC
+ windows_i586_6.2-{product|fastdebug}-{c1|c2}-jvm98, \
+ windows_i586_6.2-{product|fastdebug}-c2-jvm98_nontiered, \
+ windows_i586_6.2-{product|fastdebug}-{c1|c2}-scimark, \
+ windows_i586_6.2-product-{c1|c2}-runThese8, \
+ windows_i586_6.2-product-{c1|c2}-runThese8_Xcomp_lang, \
+ windows_i586_6.2-product-{c1|c2}-runThese8_Xcomp_vm, \
+ windows_i586_6.2-fastdebug-c1-runThese8_Xshare, \
+ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \
+ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \
+ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
+ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
+ windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
+ windows_i586_6.2-{product|fastdebug}-{c1|c2}-jbb_default, \
+ windows_i586_6.2-{product|fastdebug}-c2-jbb_default_nontiered, \
+ windows_i586_6.2-product-{c1|c2}-jbb_ParallelGC, \
+ windows_i586_6.2-product-{c1|c2}-jbb_CMS, \
+ windows_i586_6.2-product-{c1|c2}-jbb_G1, \
+ windows_i586_6.2-product-{c1|c2}-jbb_ParOldGC
my.test.targets.hotspot.windows.x64= \
- windows_x64_6.1-{product|fastdebug}-c2-jvm98, \
- windows_x64_6.1-{product|fastdebug}-c2-jvm98_nontiered, \
- windows_x64_6.1-{product|fastdebug}-c2-scimark, \
- windows_x64_6.1-product-c2-runThese8, \
- windows_x64_6.1-product-c2-runThese8_Xcomp_lang, \
- windows_x64_6.1-product-c2-runThese8_Xcomp_vm, \
- windows_x64_6.1-{product|fastdebug}-c2-GCBasher_SerialGC, \
- windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParallelGC, \
- windows_x64_6.1-{product|fastdebug}-c2-GCBasher_CMS, \
- windows_x64_6.1-{product|fastdebug}-c2-GCBasher_G1, \
- windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParOldGC, \
- windows_x64_6.1-{product|fastdebug}-c2-jbb_default, \
- windows_x64_6.1-{product|fastdebug}-c2-jbb_default_nontiered, \
- windows_x64_6.1-product-c2-jbb_CMS, \
- windows_x64_6.1-product-c2-jbb_ParallelGC, \
- windows_x64_6.1-product-c2-jbb_G1, \
- windows_x64_6.1-product-c2-jbb_ParOldGC
+ windows_x64_6.2-{product|fastdebug}-c2-jvm98, \
+ windows_x64_6.2-{product|fastdebug}-c2-jvm98_nontiered, \
+ windows_x64_6.2-{product|fastdebug}-c2-scimark, \
+ windows_x64_6.2-product-c2-runThese8, \
+ windows_x64_6.2-product-c2-runThese8_Xcomp_lang, \
+ windows_x64_6.2-product-c2-runThese8_Xcomp_vm, \
+ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_SerialGC, \
+ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_ParallelGC, \
+ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_CMS, \
+ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_G1, \
+ windows_x64_6.2-{product|fastdebug}-c2-GCBasher_ParOldGC, \
+ windows_x64_6.2-{product|fastdebug}-c2-jbb_default, \
+ windows_x64_6.2-{product|fastdebug}-c2-jbb_default_nontiered, \
+ windows_x64_6.2-product-c2-jbb_CMS, \
+ windows_x64_6.2-product-c2-jbb_ParallelGC, \
+ windows_x64_6.2-product-c2-jbb_G1, \
+ windows_x64_6.2-product-c2-jbb_ParOldGC
# Some basic "smoke" tests for OpenJDK builds
my.test.targets.hotspot.open= \
@@ -411,36 +417,36 @@
my.make.rule.test.targets.hotspot.clienttests= \
linux_i586_2.6-*-c1-hotspot_clienttest, \
- windows_i586_6.1-*-c1-hotspot_clienttest
+ windows_i586_6.2-*-c1-hotspot_clienttest
my.make.rule.test.targets.hotspot.servertests= \
solaris_sparcv9_5.11-*-c2-hotspot_servertest, \
solaris_x64_5.11-*-c2-hotspot_servertest, \
linux_i586_2.6-*-c2-hotspot_servertest, \
linux_x64_2.6-*-c2-hotspot_servertest, \
- macosx_x64_10.7-*-c2-hotspot_servertest, \
- windows_i586_6.1-*-c2-hotspot_servertest, \
- windows_x64_6.1-*-c2-hotspot_servertest
+ macosx_x64_10.9-*-c2-hotspot_servertest, \
+ windows_i586_6.2-*-c2-hotspot_servertest, \
+ windows_x64_6.2-*-c2-hotspot_servertest
my.make.rule.test.targets.hotspot.internalvmtests= \
solaris_sparcv9_5.11-fastdebug-c2-hotspot_internalvmtests, \
solaris_x64_5.11-fastdebug-c2-hotspot_internalvmtests, \
linux_i586_2.6-fastdebug-c2-hotspot_internalvmtests, \
linux_x64_2.6-fastdebug-c2-hotspot_internalvmtests, \
- macosx_x64_10.7-fastdebug-c2-hotspot_internalvmtests, \
- windows_i586_6.1-fastdebug-c2-hotspot_internalvmtests, \
- windows_x64_6.1-fastdebug-c2-hotspot_internalvmtests
+ macosx_x64_10.9-fastdebug-c2-hotspot_internalvmtests, \
+ windows_i586_6.2-fastdebug-c2-hotspot_internalvmtests, \
+ windows_x64_6.2-fastdebug-c2-hotspot_internalvmtests
my.make.rule.test.targets.hotspot.reg.group= \
solaris_sparcv9_5.11-fastdebug-c2-GROUP, \
solaris_x64_5.11-fastdebug-c2-GROUP, \
linux_i586_2.6-fastdebug-c2-GROUP, \
linux_x64_2.6-fastdebug-c2-GROUP, \
- macosx_x64_10.7-fastdebug-c2-GROUP, \
- windows_i586_6.1-fastdebug-c2-GROUP, \
- windows_x64_6.1-fastdebug-c2-GROUP, \
+ macosx_x64_10.9-fastdebug-c2-GROUP, \
+ windows_i586_6.2-fastdebug-c2-GROUP, \
+ windows_x64_6.2-fastdebug-c2-GROUP, \
linux_i586_2.6-fastdebug-c1-GROUP, \
- windows_i586_6.1-fastdebug-c1-GROUP
+ windows_i586_6.2-fastdebug-c1-GROUP
my.make.rule.test.targets.hotspot= \
${my.make.rule.test.targets.hotspot.clienttests}, \