test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java

*** 47,71 ****
   *      compiler.jvmci.common.JVMCIHelpers$EmptyCompilationRequestResult
   *      compiler.jvmci.common.JVMCIHelpers$EmptyVMEventListener
   * @run main/othervm -XX:+UnlockExperimentalVMOptions
   *     -Xbootclasspath/a:. -Xmixed
   *     -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI
-  *     -Dcompiler.jvmci.events.JvmciNotifyInstallEventTest.failoninit=false
   *     compiler.jvmci.events.JvmciNotifyInstallEventTest
   * @run main/othervm -XX:+UnlockExperimentalVMOptions
!  *     -Djvmci.compiler=EmptyCompiler -Xbootclasspath/a:. -Xmixed
   *     -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI
-  *     -Dcompiler.jvmci.events.JvmciNotifyInstallEventTest.failoninit=false
   *     compiler.jvmci.events.JvmciNotifyInstallEventTest
   * @run main/othervm -XX:+UnlockExperimentalVMOptions
!  *     -Djvmci.compiler=EmptyCompiler -Xbootclasspath/a:. -Xmixed
   *     -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI -XX:JVMCINMethodSizeLimit=0
-  *     -Dcompiler.jvmci.events.JvmciNotifyInstallEventTest.failoninit=false
-  *     compiler.jvmci.events.JvmciNotifyInstallEventTest
-  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-EnableJVMCI
-  *     -Djvmci.compiler=EmptyCompiler -Xbootclasspath/a:. -Xmixed
-  *     -Dcompiler.jvmci.events.JvmciNotifyInstallEventTest.failoninit=true
   *     compiler.jvmci.events.JvmciNotifyInstallEventTest
   */
  
  package compiler.jvmci.events;
  
--- 47,64 ----
   *      compiler.jvmci.common.JVMCIHelpers$EmptyCompilationRequestResult
   *      compiler.jvmci.common.JVMCIHelpers$EmptyVMEventListener
   * @run main/othervm -XX:+UnlockExperimentalVMOptions
   *     -Xbootclasspath/a:. -Xmixed
   *     -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI
   *     compiler.jvmci.events.JvmciNotifyInstallEventTest
   * @run main/othervm -XX:+UnlockExperimentalVMOptions
!  *     -Djvmci.Compiler=EmptyCompiler -Xbootclasspath/a:. -Xmixed
   *     -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI
   *     compiler.jvmci.events.JvmciNotifyInstallEventTest
   * @run main/othervm -XX:+UnlockExperimentalVMOptions
!  *     -Djvmci.Compiler=EmptyCompiler -Xbootclasspath/a:. -Xmixed
   *     -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI -XX:JVMCINMethodSizeLimit=0
   *     compiler.jvmci.events.JvmciNotifyInstallEventTest
   */
  
  package compiler.jvmci.events;
  
*** 89,100 ****
  
  import java.lang.reflect.Method;
  
  public class JvmciNotifyInstallEventTest extends JVMCIServiceLocator implements HotSpotVMEventListener {
      private static final String METHOD_NAME = "testMethod";
-     private static final boolean FAIL_ON_INIT = !Boolean.getBoolean(
-             "compiler.jvmci.events.JvmciNotifyInstallEventTest.failoninit");
      private static volatile int gotInstallNotification = 0;
  
      public static void main(String args[]) {
          new JvmciNotifyInstallEventTest().runTest();
      }
--- 82,91 ----
*** 114,133 ****
          HotSpotCodeCacheProvider codeCache;
          try {
              codeCache = (HotSpotCodeCacheProvider) HotSpotJVMCIRuntime.runtime()
                      .getHostJVMCIBackend().getCodeCache();
          } catch (InternalError ie) {
-             if (FAIL_ON_INIT) {
-                 throw new AssertionError(
-                         "Got unexpected InternalError trying to get code cache",
-                         ie);
-             }
              // passed
              return;
          }
-         Asserts.assertTrue(FAIL_ON_INIT,
-                     "Haven't caught InternalError in negative case");
          Method testMethod;
          try {
              testMethod = SimpleClass.class.getDeclaredMethod(METHOD_NAME);
          } catch (NoSuchMethodException e) {
              throw new Error("TEST BUG: Can't find " + METHOD_NAME, e);
--- 105,117 ----