Merge

Fri, 13 Jun 2014 08:40:35 +0000

author
neliasso
date
Fri, 13 Jun 2014 08:40:35 +0000
changeset 6726
57aecf00a0cd
parent 6724
6c06bce8d5bd
parent 6725
e5d5e7922283
child 6727
22146594cd5a

Merge

     1.1 --- a/test/compiler/whitebox/IsMethodCompilableTest.java	Fri Jun 13 00:30:18 2014 -0700
     1.2 +++ b/test/compiler/whitebox/IsMethodCompilableTest.java	Fri Jun 13 08:40:35 2014 +0000
     1.3 @@ -28,7 +28,7 @@
     1.4   * @build IsMethodCompilableTest
     1.5   * @run main ClassFileInstaller sun.hotspot.WhiteBox
     1.6   * @run main ClassFileInstaller com.oracle.java.testlibrary.Platform
     1.7 - * @run main/othervm/timeout=2400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:PerMethodRecompilationCutoff=3 -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* IsMethodCompilableTest
     1.8 + * @run main/othervm/timeout=2400 -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:PerMethodRecompilationCutoff=3 -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* IsMethodCompilableTest
     1.9   * @summary testing of WB::isMethodCompilable()
    1.10   * @author igor.ignatyev@oracle.com
    1.11   */

mercurial