Mercurial Mercurial > jdk-sandbox / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make/jprt.properties
changeset 30544 f74e62472ff3
parent 30540 5f747785a1ea
parent 30091 f86dca6d2737
child 30545 56cccb06d21c
equal deleted inserted replaced
30543:c903c8e5624d 30544:f74e62472ff3 
   121     ${jprt.fastdebugOpen.build.configure.args}
 
   121     ${jprt.fastdebugOpen.build.configure.args}
 
   122 jprt.i586.productOpen.build.configure.args=				\
 
   122 jprt.i586.productOpen.build.configure.args=				\
 
   123     ${my.i586.default.build.configure.args}				\
 
   123     ${my.i586.default.build.configure.args}				\
 
   124     ${jprt.productOpen.build.configure.args}
 
   124     ${jprt.productOpen.build.configure.args}
 
   125 
   125 
       
   126 jprt.windows_i586_6.2.build.configure.args=                             \
 
       
   127     --with-toolchain-version=2013                                       \
 
       
   128     ${jprt.i586.build.configure.args}
 
       
   129 jprt.windows_x64_6.2.build.configure.args=                              \
 
       
   130     --with-toolchain-version=2013
 
       
   131 
   126 ########
 
   132 ########
 
   127 #
 
   133 #
 
   128 # Build targets and options (default/jdk)
 
   134 # Build targets and options (default/jdk)
 
   129 #
 
   135 #
 
   130 
   136 
   136     solaris_sparcv9_5.11-{product|fastdebug},				\
 
   142     solaris_sparcv9_5.11-{product|fastdebug},				\
 
   137     solaris_x64_5.11-{product|fastdebug},				\
 
   143     solaris_x64_5.11-{product|fastdebug},				\
 
   138     linux_i586_2.6-{product|fastdebug},					\
 
   144     linux_i586_2.6-{product|fastdebug},					\
 
   139     linux_x64_2.6-{product|fastdebug},					\
 
   145     linux_x64_2.6-{product|fastdebug},					\
 
   140     macosx_x64_10.9-{product|fastdebug},				\
 
   146     macosx_x64_10.9-{product|fastdebug},				\
 
   141     windows_i586_6.1-{product|fastdebug},				\
 
   147     windows_i586_6.2-{product|fastdebug},				\
 
   142     windows_x64_6.1-{product|fastdebug}
 
   148     windows_x64_6.2-{product|fastdebug}
 
   143 
   149 
   144 # Test target list (no fastdebug & limited c2 testing)
 
   150 # Test target list (no fastdebug & limited c2 testing)
 
   145 my.test.target.set=							\
 
   151 my.test.target.set=							\
 
   146     solaris_sparcv9_5.11-product-c2-TESTNAME,				\
 
   152     solaris_sparcv9_5.11-product-c2-TESTNAME,				\
 
   147     solaris_x64_5.11-product-c2-TESTNAME,				\
 
   153     solaris_x64_5.11-product-c2-TESTNAME,				\
 
   148     linux_i586_2.6-product-{c1|c2}-TESTNAME,				\
 
   154     linux_i586_2.6-product-{c1|c2}-TESTNAME,				\
 
   149     linux_x64_2.6-product-c2-TESTNAME,					\
 
   155     linux_x64_2.6-product-c2-TESTNAME,					\
 
   150     macosx_x64_10.9-product-c2-TESTNAME,				\
 
   156     macosx_x64_10.9-product-c2-TESTNAME,				\
 
   151     windows_i586_6.1-product-c1-TESTNAME,				\
 
   157     windows_i586_6.2-product-c1-TESTNAME,				\
 
   152     windows_x64_6.1-product-c2-TESTNAME
 
   158     windows_x64_6.2-product-c2-TESTNAME
 
   153 
   159 
   154 # Default vm test targets (testset=default)
 
   160 # Default vm test targets (testset=default)
 
   155 my.test.targets.default=						\
 
   161 my.test.targets.default=						\
 
   156     ${my.test.target.set:TESTNAME=jvm98},				\
 
   162     ${my.test.target.set:TESTNAME=jvm98},				\
 
   157     ${my.test.target.set:TESTNAME=scimark}
 
   163     ${my.test.target.set:TESTNAME=scimark}
 
   258     solaris_sparcv9_5.11-{product|fastdebug},			\
 
   264     solaris_sparcv9_5.11-{product|fastdebug},			\
 
   259     solaris_x64_5.11-{product|fastdebug},				\
 
   265     solaris_x64_5.11-{product|fastdebug},				\
 
   260     linux_i586_2.6-{product|fastdebug},					\
 
   266     linux_i586_2.6-{product|fastdebug},					\
 
   261     linux_x64_2.6-{product|fastdebug},			\
 
   267     linux_x64_2.6-{product|fastdebug},			\
 
   262     macosx_x64_10.9-{product|fastdebug},				\
 
   268     macosx_x64_10.9-{product|fastdebug},				\
 
   263     windows_i586_6.1-{product|fastdebug},				\
 
   269     windows_i586_6.2-{product|fastdebug},				\
 
   264     windows_x64_6.1-{product|fastdebug},			\
 
   270     windows_x64_6.2-{product|fastdebug},			\
 
   265     solaris_x64_5.11-{debugOpen},					\
 
   271     solaris_x64_5.11-{debugOpen},					\
 
   266     linux_x64_2.6-{productOpen},					\
 
   272     linux_x64_2.6-{productOpen},					\
 
   267     ${my.additional.build.targets.hotspot}
 
   273     ${my.additional.build.targets.hotspot}
 
   268 
   274 
   269 # Tests to run on the various platforms for hotspot push jobs
 
   275 # Tests to run on the various platforms for hotspot push jobs
 
   348     macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParallelGC,		\
 
   354     macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParallelGC,		\
 
   349     macosx_x64_10.9-{product|fastdebug}-c2-jbb_G1,			\
 
   355     macosx_x64_10.9-{product|fastdebug}-c2-jbb_G1,			\
 
   350     macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParOldGC
 
   356     macosx_x64_10.9-{product|fastdebug}-c2-jbb_ParOldGC
 
   351 
   357 
   352 my.test.targets.hotspot.windows.i586=					\
 
   358 my.test.targets.hotspot.windows.i586=					\
 
   353     windows_i586_6.1-{product|fastdebug}-{c1|c2}-jvm98,			\
 
   359     windows_i586_6.2-{product|fastdebug}-{c1|c2}-jvm98,			\
 
   354     windows_i586_6.1-{product|fastdebug}-c2-jvm98_nontiered,		\
 
   360     windows_i586_6.2-{product|fastdebug}-c2-jvm98_nontiered,		\
 
   355     windows_i586_6.1-{product|fastdebug}-{c1|c2}-scimark,		\
 
   361     windows_i586_6.2-{product|fastdebug}-{c1|c2}-scimark,		\
 
   356     windows_i586_6.1-product-{c1|c2}-runThese8,				\
 
   362     windows_i586_6.2-product-{c1|c2}-runThese8,				\
 
   357     windows_i586_6.1-product-{c1|c2}-runThese8_Xcomp_lang,		\
 
   363     windows_i586_6.2-product-{c1|c2}-runThese8_Xcomp_lang,		\
 
   358     windows_i586_6.1-product-{c1|c2}-runThese8_Xcomp_vm,		\
 
   364     windows_i586_6.2-product-{c1|c2}-runThese8_Xcomp_vm,		\
 
   359     windows_i586_6.1-fastdebug-c1-runThese8_Xshare,			\
 
   365     windows_i586_6.2-fastdebug-c1-runThese8_Xshare,			\
 
   360     windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC,	\
 
   366     windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC,	\
 
   361     windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC,	\
 
   367     windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC,	\
 
   362     windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_CMS,		\
 
   368     windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_CMS,		\
 
   363     windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_G1,		\
 
   369     windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_G1,		\
 
   364     windows_i586_6.1-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC,	\
 
   370     windows_i586_6.2-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC,	\
 
   365     windows_i586_6.1-{product|fastdebug}-{c1|c2}-jbb_default,		\
 
   371     windows_i586_6.2-{product|fastdebug}-{c1|c2}-jbb_default,		\
 
   366     windows_i586_6.1-{product|fastdebug}-c2-jbb_default_nontiered,	\
 
   372     windows_i586_6.2-{product|fastdebug}-c2-jbb_default_nontiered,	\
 
   367     windows_i586_6.1-product-{c1|c2}-jbb_ParallelGC,			\
 
   373     windows_i586_6.2-product-{c1|c2}-jbb_ParallelGC,			\
 
   368     windows_i586_6.1-product-{c1|c2}-jbb_CMS,				\
 
   374     windows_i586_6.2-product-{c1|c2}-jbb_CMS,				\
 
   369     windows_i586_6.1-product-{c1|c2}-jbb_G1,				\
 
   375     windows_i586_6.2-product-{c1|c2}-jbb_G1,				\
 
   370     windows_i586_6.1-product-{c1|c2}-jbb_ParOldGC
 
   376     windows_i586_6.2-product-{c1|c2}-jbb_ParOldGC
 
   371 
   377 
   372 my.test.targets.hotspot.windows.x64=					\
 
   378 my.test.targets.hotspot.windows.x64=					\
 
   373     windows_x64_6.1-{product|fastdebug}-c2-jvm98,			\
 
   379     windows_x64_6.2-{product|fastdebug}-c2-jvm98,			\
 
   374     windows_x64_6.1-{product|fastdebug}-c2-jvm98_nontiered,		\
 
   380     windows_x64_6.2-{product|fastdebug}-c2-jvm98_nontiered,		\
 
   375     windows_x64_6.1-{product|fastdebug}-c2-scimark,			\
 
   381     windows_x64_6.2-{product|fastdebug}-c2-scimark,			\
 
   376     windows_x64_6.1-product-c2-runThese8,				\
 
   382     windows_x64_6.2-product-c2-runThese8,				\
 
   377     windows_x64_6.1-product-c2-runThese8_Xcomp_lang,			\
 
   383     windows_x64_6.2-product-c2-runThese8_Xcomp_lang,			\
 
   378     windows_x64_6.1-product-c2-runThese8_Xcomp_vm,			\
 
   384     windows_x64_6.2-product-c2-runThese8_Xcomp_vm,			\
 
   379     windows_x64_6.1-{product|fastdebug}-c2-GCBasher_SerialGC,		\
 
   385     windows_x64_6.2-{product|fastdebug}-c2-GCBasher_SerialGC,		\
 
   380     windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParallelGC,		\
 
   386     windows_x64_6.2-{product|fastdebug}-c2-GCBasher_ParallelGC,		\
 
   381     windows_x64_6.1-{product|fastdebug}-c2-GCBasher_CMS,		\
 
   387     windows_x64_6.2-{product|fastdebug}-c2-GCBasher_CMS,		\
 
   382     windows_x64_6.1-{product|fastdebug}-c2-GCBasher_G1,			\
 
   388     windows_x64_6.2-{product|fastdebug}-c2-GCBasher_G1,			\
 
   383     windows_x64_6.1-{product|fastdebug}-c2-GCBasher_ParOldGC,		\
 
   389     windows_x64_6.2-{product|fastdebug}-c2-GCBasher_ParOldGC,		\
 
   384     windows_x64_6.1-{product|fastdebug}-c2-jbb_default,			\
 
   390     windows_x64_6.2-{product|fastdebug}-c2-jbb_default,			\
 
   385     windows_x64_6.1-{product|fastdebug}-c2-jbb_default_nontiered,	\
 
   391     windows_x64_6.2-{product|fastdebug}-c2-jbb_default_nontiered,	\
 
   386     windows_x64_6.1-product-c2-jbb_CMS,					\
 
   392     windows_x64_6.2-product-c2-jbb_CMS,					\
 
   387     windows_x64_6.1-product-c2-jbb_ParallelGC,				\
 
   393     windows_x64_6.2-product-c2-jbb_ParallelGC,				\
 
   388     windows_x64_6.1-product-c2-jbb_G1,					\
 
   394     windows_x64_6.2-product-c2-jbb_G1,					\
 
   389     windows_x64_6.1-product-c2-jbb_ParOldGC
 
   395     windows_x64_6.2-product-c2-jbb_ParOldGC
 
   390 
   396 
   391 # Some basic "smoke" tests for OpenJDK builds
 
   397 # Some basic "smoke" tests for OpenJDK builds
 
   392 my.test.targets.hotspot.open=						\
 
   398 my.test.targets.hotspot.open=						\
 
   393     solaris_x64_5.11-{productOpen|fastdebugOpen}-c2-jvm98,		\
 
   399     solaris_x64_5.11-{productOpen|fastdebugOpen}-c2-jvm98,		\
 
   394     linux_x64_2.6-{productOpen|fastdebugOpen}-c2-jvm98
 
   400     linux_x64_2.6-{productOpen|fastdebugOpen}-c2-jvm98
 
   417   linux_i586_2.6-*-default-hotspot_basicvmtest,                         \
 
   423   linux_i586_2.6-*-default-hotspot_basicvmtest,                         \
 
   418   linux_x64_2.6-*-default-hotspot_basicvmtest,                          \
 
   424   linux_x64_2.6-*-default-hotspot_basicvmtest,                          \
 
   419   macosx_x64_10.9-*-default-hotspot_basicvmtest,                        \
 
   425   macosx_x64_10.9-*-default-hotspot_basicvmtest,                        \
 
   420   solaris_sparcv9_5.11-*-default-hotspot_basicvmtest,                   \
 
   426   solaris_sparcv9_5.11-*-default-hotspot_basicvmtest,                   \
 
   421   solaris_x64_5.11-*-default-hotspot_basicvmtest,                       \
 
   427   solaris_x64_5.11-*-default-hotspot_basicvmtest,                       \
 
   422   windows_i586_6.1-*-default-hotspot_basicvmtest,                       \
 
   428   windows_i586_6.2-*-default-hotspot_basicvmtest,                       \
 
   423   windows_x64_6.1-*-default-hotspot_basicvmtest
 
   429   windows_x64_6.2-*-default-hotspot_basicvmtest
 
   424   
   430   
   425 my.make.rule.test.targets.hotspot.internalvmtests=			\
 
   431 my.make.rule.test.targets.hotspot.internalvmtests=			\
 
   426   solaris_sparcv9_5.11-fastdebug-c2-hotspot_internalvmtests,		\
 
   432   solaris_sparcv9_5.11-fastdebug-c2-hotspot_internalvmtests,		\
 
   427   solaris_x64_5.11-fastdebug-c2-hotspot_internalvmtests,		\
 
   433   solaris_x64_5.11-fastdebug-c2-hotspot_internalvmtests,		\
 
   428   linux_i586_2.6-fastdebug-c2-hotspot_internalvmtests,			\
 
   434   linux_i586_2.6-fastdebug-c2-hotspot_internalvmtests,			\
 
   429   linux_x64_2.6-fastdebug-c2-hotspot_internalvmtests,			\
 
   435   linux_x64_2.6-fastdebug-c2-hotspot_internalvmtests,			\
 
   430   macosx_x64_10.9-fastdebug-c2-hotspot_internalvmtests,			\
 
   436   macosx_x64_10.9-fastdebug-c2-hotspot_internalvmtests,			\
 
   431   windows_i586_6.1-fastdebug-c2-hotspot_internalvmtests,		\
 
   437   windows_i586_6.2-fastdebug-c2-hotspot_internalvmtests,		\
 
   432   windows_x64_6.1-fastdebug-c2-hotspot_internalvmtests
 
   438   windows_x64_6.2-fastdebug-c2-hotspot_internalvmtests
 
   433 
   439 
   434 my.make.rule.test.targets.hotspot.reg.group=				\
 
   440 my.make.rule.test.targets.hotspot.reg.group=				\
 
   435   solaris_sparcv9_5.11-fastdebug-c2-GROUP,				\
 
   441   solaris_sparcv9_5.11-fastdebug-c2-GROUP,				\
 
   436   solaris_x64_5.11-fastdebug-c2-GROUP,					\
 
   442   solaris_x64_5.11-fastdebug-c2-GROUP,					\
 
   437   linux_i586_2.6-fastdebug-c2-GROUP,					\
 
   443   linux_i586_2.6-fastdebug-c2-GROUP,					\
 
   438   linux_x64_2.6-fastdebug-c2-GROUP,					\
 
   444   linux_x64_2.6-fastdebug-c2-GROUP,					\
 
   439   macosx_x64_10.9-fastdebug-c2-GROUP,					\
 
   445   macosx_x64_10.9-fastdebug-c2-GROUP,					\
 
   440   windows_i586_6.1-fastdebug-c2-GROUP,					\
 
   446   windows_i586_6.2-fastdebug-c2-GROUP,					\
 
   441   windows_x64_6.1-fastdebug-c2-GROUP,					\
 
   447   windows_x64_6.2-fastdebug-c2-GROUP,					\
 
   442   linux_i586_2.6-fastdebug-c1-GROUP,					\
 
   448   linux_i586_2.6-fastdebug-c1-GROUP,					\
 
   443   windows_i586_6.1-fastdebug-c1-GROUP
 
   449   windows_i586_6.2-fastdebug-c1-GROUP
 
   444 
   450 
   445 # Hotspot jtreg tests
 
   451 # Hotspot jtreg tests
 
   446 my.make.rule.test.targets.hotspot.reg=						\
 
   452 my.make.rule.test.targets.hotspot.reg=						\
 
   447   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_1},	\
 
   453   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_1},	\
 
   448   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_2},	\
 
   454   ${my.make.rule.test.targets.hotspot.reg.group:GROUP=hotspot_compiler_2},	\
jdk-sandbox