--- a/make/jprt.properties Fri May 01 09:45:44 2015 -0400
+++ b/make/jprt.properties Sat May 02 18:35:36 2015 -0700
@@ -123,6 +123,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)
@@ -138,8 +144,8 @@
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
macosx_x64_10.9-{product|fastdebug}, \
- windows_i586_6.1-{product|fastdebug}, \
- windows_x64_6.1-{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= \
@@ -148,8 +154,8 @@
linux_i586_2.6-product-{c1|c2}-TESTNAME, \
linux_x64_2.6-product-c2-TESTNAME, \
macosx_x64_10.9-product-c2-TESTNAME, \
- windows_i586_6.1-product-c1-TESTNAME, \
- windows_x64_6.1-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= \
@@ -260,8 +266,8 @@
linux_i586_2.6-{product|fastdebug}, \
linux_x64_2.6-{product|fastdebug}, \
macosx_x64_10.9-{product|fastdebug}, \
- windows_i586_6.1-{product|fastdebug}, \
- windows_x64_6.1-{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}
@@ -350,43 +356,43 @@
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= \
@@ -419,8 +425,8 @@
macosx_x64_10.9-*-default-hotspot_basicvmtest, \
solaris_sparcv9_5.11-*-default-hotspot_basicvmtest, \
solaris_x64_5.11-*-default-hotspot_basicvmtest, \
- windows_i586_6.1-*-default-hotspot_basicvmtest, \
- windows_x64_6.1-*-default-hotspot_basicvmtest
+ windows_i586_6.2-*-default-hotspot_basicvmtest, \
+ windows_x64_6.2-*-default-hotspot_basicvmtest
my.make.rule.test.targets.hotspot.internalvmtests= \
solaris_sparcv9_5.11-fastdebug-c2-hotspot_internalvmtests, \
@@ -428,8 +434,8 @@
linux_i586_2.6-fastdebug-c2-hotspot_internalvmtests, \
linux_x64_2.6-fastdebug-c2-hotspot_internalvmtests, \
macosx_x64_10.9-fastdebug-c2-hotspot_internalvmtests, \
- windows_i586_6.1-fastdebug-c2-hotspot_internalvmtests, \
- windows_x64_6.1-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, \
@@ -437,10 +443,10 @@
linux_i586_2.6-fastdebug-c2-GROUP, \
linux_x64_2.6-fastdebug-c2-GROUP, \
macosx_x64_10.9-fastdebug-c2-GROUP, \
- windows_i586_6.1-fastdebug-c2-GROUP, \
- windows_x64_6.1-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
# Hotspot jtreg tests
my.make.rule.test.targets.hotspot.reg= \