Merge
This commit is contained in:
commit
e3198c371a
@ -258,13 +258,11 @@ my.test.targets.hotspot.solaris.sparcv9= \
|
||||
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, \
|
||||
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_CMS, \
|
||||
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_G1, \
|
||||
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCBasher_ParOldGC, \
|
||||
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_SerialGC, \
|
||||
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_ParallelGC, \
|
||||
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_ParNewGC, \
|
||||
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_CMS, \
|
||||
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_G1, \
|
||||
solaris_sparcv9_5.11-{product|fastdebug}-c2-GCOld_ParOldGC, \
|
||||
@ -284,13 +282,11 @@ my.test.targets.hotspot.solaris.x64= \
|
||||
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, \
|
||||
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_CMS, \
|
||||
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_G1, \
|
||||
solaris_x64_5.11-{product|fastdebug}-c2-GCBasher_ParOldGC, \
|
||||
solaris_x64_5.11-{product|fastdebug}-c2-GCOld_SerialGC, \
|
||||
solaris_x64_5.11-{product|fastdebug}-c2-GCOld_ParallelGC, \
|
||||
solaris_x64_5.11-{product|fastdebug}-c2-GCOld_ParNewGC, \
|
||||
solaris_x64_5.11-{product|fastdebug}-c2-GCOld_CMS, \
|
||||
solaris_x64_5.11-{product|fastdebug}-c2-GCOld_G1, \
|
||||
solaris_x64_5.11-{product|fastdebug}-c2-GCOld_ParOldGC, \
|
||||
@ -312,13 +308,11 @@ my.test.targets.hotspot.linux.i586= \
|
||||
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, \
|
||||
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \
|
||||
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_G1, \
|
||||
linux_i586_2.6-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \
|
||||
linux_i586_2.6-product-{c1|c2}-GCOld_SerialGC, \
|
||||
linux_i586_2.6-product-{c1|c2}-GCOld_ParallelGC, \
|
||||
linux_i586_2.6-product-{c1|c2}-GCOld_ParNewGC, \
|
||||
linux_i586_2.6-product-{c1|c2}-GCOld_CMS, \
|
||||
linux_i586_2.6-product-{c1|c2}-GCOld_G1, \
|
||||
linux_i586_2.6-product-{c1|c2}-GCOld_ParOldGC, \
|
||||
@ -335,13 +329,11 @@ my.test.targets.hotspot.linux.x64= \
|
||||
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_ParNewGC, \
|
||||
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_CMS, \
|
||||
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_G1, \
|
||||
linux_x64_2.6-{product|fastdebug}-c2-GCBasher_ParOldGC, \
|
||||
linux_x64_2.6-{product|fastdebug}-c2-GCOld_SerialGC, \
|
||||
linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParallelGC, \
|
||||
linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParNewGC, \
|
||||
linux_x64_2.6-{product|fastdebug}-c2-GCOld_CMS, \
|
||||
linux_x64_2.6-{product|fastdebug}-c2-GCOld_G1, \
|
||||
linux_x64_2.6-{product|fastdebug}-c2-GCOld_ParOldGC, \
|
||||
@ -356,13 +348,11 @@ my.test.targets.hotspot.macosx.x64= \
|
||||
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_ParNewGC, \
|
||||
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-GCOld_SerialGC, \
|
||||
macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParallelGC, \
|
||||
macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParNewGC, \
|
||||
macosx_x64_10.7-{product|fastdebug}-c2-GCOld_CMS, \
|
||||
macosx_x64_10.7-{product|fastdebug}-c2-GCOld_G1, \
|
||||
macosx_x64_10.7-{product|fastdebug}-c2-GCOld_ParOldGC, \
|
||||
@ -381,13 +371,11 @@ my.test.targets.hotspot.windows.i586= \
|
||||
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, \
|
||||
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-{c1|c2}-GCOld_SerialGC, \
|
||||
windows_i586_6.1-product-{c1|c2}-GCOld_ParallelGC, \
|
||||
windows_i586_6.1-product-{c1|c2}-GCOld_ParNewGC, \
|
||||
windows_i586_6.1-product-{c1|c2}-GCOld_CMS, \
|
||||
windows_i586_6.1-product-{c1|c2}-GCOld_G1, \
|
||||
windows_i586_6.1-product-{c1|c2}-GCOld_ParOldGC, \
|
||||
@ -407,13 +395,11 @@ my.test.targets.hotspot.windows.x64= \
|
||||
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, \
|
||||
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-GCOld_SerialGC, \
|
||||
windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParallelGC, \
|
||||
windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParNewGC, \
|
||||
windows_x64_6.1-{product|fastdebug}-c2-GCOld_CMS, \
|
||||
windows_x64_6.1-{product|fastdebug}-c2-GCOld_G1, \
|
||||
windows_x64_6.1-{product|fastdebug}-c2-GCOld_ParOldGC, \
|
||||
|
Loading…
Reference in New Issue
Block a user