# HG changeset patch
# User neliasso
# Date 1402648835 0
# Node ID 57aecf00a0cd60193b5060ddc2f7654ab7d9aa28
# Parent  6c06bce8d5bd47f1cf3c6e63541fcd3d325cc1d6# Parent  e5d5e792228362dc8867ecf5f5ad7bc703f2b1dc
Merge

diff -r 6c06bce8d5bd -r 57aecf00a0cd test/compiler/whitebox/IsMethodCompilableTest.java
--- a/test/compiler/whitebox/IsMethodCompilableTest.java	Fri Jun 13 00:30:18 2014 -0700
+++ b/test/compiler/whitebox/IsMethodCompilableTest.java	Fri Jun 13 08:40:35 2014 +0000
@@ -28,7 +28,7 @@
  * @build IsMethodCompilableTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main ClassFileInstaller com.oracle.java.testlibrary.Platform
- * @run main/othervm/timeout=2400 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:PerMethodRecompilationCutoff=3 -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* IsMethodCompilableTest
+ * @run main/othervm/timeout=2400 -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:PerMethodRecompilationCutoff=3 -XX:CompileCommand=compileonly,SimpleTestCase$Helper::* IsMethodCompilableTest
  * @summary testing of WB::isMethodCompilable()
  * @author igor.ignatyev@oracle.com
  */