# HG changeset patch # User sspitsyn # Date 1406145154 25200 # Node ID 685aaa73b3194c2be6e261af1bf73071a54d3d93 # Parent 1a806d6ffdfc17c494e36d5f36b5020f8c146792# Parent 4e55b4621fd06c024d8ad59d85fe8ee5b989618e Merge diff -r 1a806d6ffdfc -r 685aaa73b319 make/jprt.properties --- a/make/jprt.properties Fri Jul 18 12:22:50 2014 -0700 +++ b/make/jprt.properties Wed Jul 23 12:52:34 2014 -0700 @@ -249,7 +249,7 @@ solaris_sparcv9_5.11-{product|fastdebug}-c2-jvm98, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-jvm98_nontiered, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-scimark, \ - solaris_sparcv9_5.11-product-c2-runThese, \ + solaris_sparcv9_5.11-product-c2-runThese8, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \ solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParNewGC, \ @@ -273,8 +273,9 @@ solaris_x64_5.11-{product|fastdebug}-c2-jvm98, \ solaris_x64_5.11-{product|fastdebug}-c2-jvm98_nontiered, \ solaris_x64_5.11-{product|fastdebug}-c2-scimark, \ - solaris_x64_5.11-product-c2-runThese, \ - solaris_x64_5.11-product-c2-runThese_Xcomp, \ + solaris_x64_5.11-product-c2-runThese8, \ + solaris_x64_5.11-product-c2-runThese8_Xcomp_lang, \ + solaris_x64_5.11-product-c2-runThese8_Xcomp_vm, \ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_SerialGC, \ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParallelGC, \ solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParNewGC, \ @@ -298,9 +299,11 @@ 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-runThese_Xcomp, \ - linux_i586_2.6-fastdebug-c1-runThese_Xshare, \ - linux_i586_2.6-fastdebug-c2-runThese_Xcomp, \ + 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_ParNewGC, \ @@ -366,9 +369,10 @@ 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}-runThese, \ - windows_i586_6.1-product-{c1|c2}-runThese_Xcomp, \ - windows_i586_6.1-fastdebug-c1-runThese_Xshare, \ + 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_ParNewGC, \ @@ -392,8 +396,9 @@ 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-runThese, \ - windows_x64_6.1-product-c2-runThese_Xcomp, \ + 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_ParNewGC, \