changeset 1891:d3ccd4896abb

8147950: Change JPRT to use new platforms for Linux, Windows and Macosx Reviewed-by: tbell
author erikj
date Thu, 21 Jan 2016 17:35:28 +0100
parents 2354fb0da6fc
children 47d6462e514b
files make/jprt.properties
diffstat 1 files changed, 72 insertions(+), 69 deletions(-) [+]
line wrap: on
line diff
--- a/make/jprt.properties	Thu Jan 21 15:10:42 2016 +0100
+++ b/make/jprt.properties	Thu Jan 21 17:35:28 2016 +0100
@@ -34,7 +34,7 @@
 # The current release name
 jprt.tools.default.release=jdk9
 
-# Allow concurrent changes to be merged in prior to pushing 
+# Allow concurrent changes to be merged in prior to pushing
 jprt.sync.push=true
 
 # Directories to be excluded from the source bundles
@@ -43,6 +43,9 @@
 # Use configure when building
 jprt.build.use.configure=true
 
+# Disable the need for preinstalled Xcode
+jprt.macosx.jdk9.target.attribute.compilerXcode511.appliesTo.builds=none
+
 # Set up the run flavors (jvm variants)
 jprt.run.flavors=c1,c2,default,${my.additional.run.flavors}
 
@@ -99,7 +102,7 @@
     --with-output-sync=recurse						\
     --with-boot-jdk=$ALT_BOOTDIR					\
     --with-jobs=$ALT_PARALLEL_COMPILE_JOBS				\
-    --with-version-opt=$JPRT_JOB_ID				 	\
+    --with-version-opt=$JPRT_JOB_ID					\
     MAKE=$JPRT_MAKE                                                     \
     ${my.additional.build.configure.args.${jprt.test.set}}		\
     ${my.custom.build.configure.args}
@@ -157,21 +160,21 @@
 my.build.targets.default=						\
     solaris_sparcv9_5.11-{product|fastdebug},				\
     solaris_x64_5.11-{product|fastdebug},				\
-    linux_i586_2.6-{product|fastdebug},					\
-    linux_x64_2.6-{product|fastdebug},					\
+    linux_i586_3.8-{product|fastdebug},					\
+    linux_x64_3.8-{product|fastdebug},					\
     macosx_x64_10.9-{product|fastdebug},				\
-    windows_i586_6.2-{product|fastdebug},				\
-    windows_x64_6.2-{product|fastdebug}
+    windows_i586_6.3-{product|fastdebug},				\
+    windows_x64_6.3-{product|fastdebug}
 
 # Test target list (no fastdebug & limited c2 testing)
 my.test.target.set=							\
     solaris_sparcv9_5.11-product-c2-TESTNAME,				\
     solaris_x64_5.11-product-c2-TESTNAME,				\
-    linux_i586_2.6-product-{c1|c2}-TESTNAME,				\
-    linux_x64_2.6-product-c2-TESTNAME,					\
+    linux_i586_3.8-product-{c1|c2}-TESTNAME,				\
+    linux_x64_3.8-product-c2-TESTNAME,					\
     macosx_x64_10.9-product-c2-TESTNAME,				\
-    windows_i586_6.2-product-c1-TESTNAME,				\
-    windows_x64_6.2-product-c2-TESTNAME
+    windows_i586_6.3-product-c1-TESTNAME,				\
+    windows_x64_6.3-product-c2-TESTNAME
 
 # Default vm test targets (testset=default)
 my.test.targets.default=						\
@@ -255,8 +258,8 @@
 my.test.target.set.jck=							\
     solaris_sparcv9_5.11-product-c2-JCK7TESTRULE,			\
     solaris_x64_5.11-product-c2-JCK7TESTRULE,				\
-    linux_i586_2.6-product-c1-JCK7TESTRULE,				\
-    linux_x64_2.6-product-c2-JCK7TESTRULE
+    linux_i586_3.8-product-c1-JCK7TESTRULE,				\
+    linux_x64_3.8-product-c2-JCK7TESTRULE
 
 # JCK testset targets
 my.make.rule.test.targets.jck=						\
@@ -279,13 +282,13 @@
 my.build.targets.hotspot=						\
     solaris_sparcv9_5.11-{product|fastdebug},			\
     solaris_x64_5.11-{product|fastdebug},				\
-    linux_i586_2.6-{product|fastdebug},					\
-    linux_x64_2.6-{product|fastdebug},			\
+    linux_i586_3.8-{product|fastdebug},					\
+    linux_x64_3.8-{product|fastdebug},			\
     macosx_x64_10.9-{product|fastdebug},				\
-    windows_i586_6.2-{product|fastdebug},				\
-    windows_x64_6.2-{product|fastdebug},			\
+    windows_i586_6.3-{product|fastdebug},				\
+    windows_x64_6.3-{product|fastdebug},			\
     solaris_x64_5.11-{debugOpen},					\
-    linux_x64_2.6-{productOpen},					\
+    linux_x64_3.8-{productOpen},					\
     ${my.additional.build.targets.hotspot}
 
 # Tests to run on the various platforms for hotspot push jobs
@@ -312,27 +315,27 @@
     solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_G1
 
 my.test.targets.hotspot.linux.i586=					\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-jvm98,			\
-    linux_i586_2.6-{product|fastdebug}-c2-jvm98_nontiered,		\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-scimark,			\
-    linux_i586_2.6-product-c1-runThese8_Xcomp_lang,			\
-    linux_i586_2.6-product-c1-runThese8_Xcomp_vm,			\
-    linux_i586_2.6-fastdebug-c1-runThese8_Xshare,			\
-    linux_i586_2.6-fastdebug-c2-runThese8_Xcomp_lang,			\
-    linux_i586_2.6-fastdebug-c2-runThese8_Xcomp_vm,			\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC,	\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC,	\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_CMS,		\
-    linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_G1
+    linux_i586_3.8-{product|fastdebug}-{c1|c2}-jvm98,			\
+    linux_i586_3.8-{product|fastdebug}-c2-jvm98_nontiered,		\
+    linux_i586_3.8-{product|fastdebug}-{c1|c2}-scimark,			\
+    linux_i586_3.8-product-c1-runThese8_Xcomp_lang,			\
+    linux_i586_3.8-product-c1-runThese8_Xcomp_vm,			\
+    linux_i586_3.8-fastdebug-c1-runThese8_Xshare,			\
+    linux_i586_3.8-fastdebug-c2-runThese8_Xcomp_lang,			\
+    linux_i586_3.8-fastdebug-c2-runThese8_Xcomp_vm,			\
+    linux_i586_3.8-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC,	\
+    linux_i586_3.8-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC,	\
+    linux_i586_3.8-{product|fastdebug}-{c1|c2}-GCBasher_CMS,		\
+    linux_i586_3.8-{product|fastdebug}-{c1|c2}-GCBasher_G1
 
 my.test.targets.hotspot.linux.x64=					\
-    linux_x64_2.6-{product|fastdebug}-c2-jvm98,				\
-    linux_x64_2.6-{product|fastdebug}-c2-jvm98_nontiered,		\
-    linux_x64_2.6-{product|fastdebug}-c2-scimark,			\
-    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_SerialGC,		\
-    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParallelGC,		\
-    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_CMS,			\
-    linux_x64_2.6-{product|fastdebug}-c2-GCBasher_G1
+    linux_x64_3.8-{product|fastdebug}-c2-jvm98,				\
+    linux_x64_3.8-{product|fastdebug}-c2-jvm98_nontiered,		\
+    linux_x64_3.8-{product|fastdebug}-c2-scimark,			\
+    linux_x64_3.8-{product|fastdebug}-c2-GCBasher_SerialGC,		\
+    linux_x64_3.8-{product|fastdebug}-c2-GCBasher_ParallelGC,		\
+    linux_x64_3.8-{product|fastdebug}-c2-GCBasher_CMS,			\
+    linux_x64_3.8-{product|fastdebug}-c2-GCBasher_G1
 
 my.test.targets.hotspot.macosx.x64=					\
     macosx_x64_10.9-{product|fastdebug}-c2-jvm98,			\
@@ -344,34 +347,34 @@
     macosx_x64_10.9-{product|fastdebug}-c2-GCBasher_G1
 
 my.test.targets.hotspot.windows.i586=					\
-    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.3-{product|fastdebug}-{c1|c2}-jvm98,			\
+    windows_i586_6.3-{product|fastdebug}-c2-jvm98_nontiered,		\
+    windows_i586_6.3-{product|fastdebug}-{c1|c2}-scimark,		\
+    windows_i586_6.3-product-{c1|c2}-runThese8,				\
+    windows_i586_6.3-product-{c1|c2}-runThese8_Xcomp_lang,		\
+    windows_i586_6.3-product-{c1|c2}-runThese8_Xcomp_vm,		\
+    windows_i586_6.3-fastdebug-c1-runThese8_Xshare,			\
+    windows_i586_6.3-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC,	\
+    windows_i586_6.3-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC,	\
+    windows_i586_6.3-{product|fastdebug}-{c1|c2}-GCBasher_CMS,		\
+    windows_i586_6.3-{product|fastdebug}-{c1|c2}-GCBasher_G1
 
 my.test.targets.hotspot.windows.x64=					\
-    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.3-{product|fastdebug}-c2-jvm98,			\
+    windows_x64_6.3-{product|fastdebug}-c2-jvm98_nontiered,		\
+    windows_x64_6.3-{product|fastdebug}-c2-scimark,			\
+    windows_x64_6.3-product-c2-runThese8,				\
+    windows_x64_6.3-product-c2-runThese8_Xcomp_lang,			\
+    windows_x64_6.3-product-c2-runThese8_Xcomp_vm,			\
+    windows_x64_6.3-{product|fastdebug}-c2-GCBasher_SerialGC,		\
+    windows_x64_6.3-{product|fastdebug}-c2-GCBasher_ParallelGC,		\
+    windows_x64_6.3-{product|fastdebug}-c2-GCBasher_CMS,		\
+    windows_x64_6.3-{product|fastdebug}-c2-GCBasher_G1
 
 # Some basic "smoke" tests for OpenJDK builds
 my.test.targets.hotspot.open=						\
     solaris_x64_5.11-{productOpen|fastdebugOpen}-c2-jvm98,		\
-    linux_x64_2.6-{productOpen|fastdebugOpen}-c2-jvm98
+    linux_x64_3.8-{productOpen|fastdebugOpen}-c2-jvm98
 
 # The complete list of test targets for jprt
 my.test.targets.hotspot=						\
@@ -394,24 +397,24 @@
 # Make file based test targets
 
 my.make.rule.test.targets.hotspot.basicvmtests=                         \
-  linux_i586_2.6-*-default-hotspot_basicvmtest,                         \
-  linux_x64_2.6-*-default-hotspot_basicvmtest,                          \
+  linux_i586_3.8-*-default-hotspot_basicvmtest,                         \
+  linux_x64_3.8-*-default-hotspot_basicvmtest,                          \
   macosx_x64_10.9-*-default-hotspot_basicvmtest,                        \
   solaris_sparcv9_5.11-*-default-hotspot_basicvmtest,                   \
   solaris_x64_5.11-*-default-hotspot_basicvmtest,                       \
-  windows_i586_6.2-*-default-hotspot_basicvmtest,                       \
-  windows_x64_6.2-*-default-hotspot_basicvmtest
-  
+  windows_i586_6.3-*-default-hotspot_basicvmtest,                       \
+  windows_x64_6.3-*-default-hotspot_basicvmtest
+
 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,					\
+  linux_i586_3.8-fastdebug-c2-GROUP,					\
+  linux_x64_3.8-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.2-fastdebug-c1-GROUP
+  windows_i586_6.3-fastdebug-c2-GROUP,					\
+  windows_x64_6.3-fastdebug-c2-GROUP,					\
+  linux_i586_3.8-fastdebug-c1-GROUP,					\
+  windows_i586_6.3-fastdebug-c1-GROUP
 
 # Hotspot jtreg tests
 my.make.rule.test.targets.hotspot.reg=						\