8208379: compiler/jvmci/events/JvmciNotifyInstallEventTest.java failed with "Got unexpected event count after 2nd install attempt: expected 9 to equal 2"
Reviewed-by: iignatyev
--- a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java Thu Jun 06 14:13:59 2019 -0700
+++ b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java Thu Jun 06 15:12:37 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
/**
* @test
* @bug 8156034
- * @requires vm.jvmci
+ * @requires vm.jvmci & !vm.graal.enabled
* @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
--- a/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.java Thu Jun 06 14:13:59 2019 -0700
+++ b/test/hotspot/jtreg/compiler/jvmci/events/JvmciNotifyInstallEventTest.java Thu Jun 06 15:12:37 2019 -0700
@@ -24,7 +24,7 @@
/*
* @test
* @bug 8136421
- * @requires vm.jvmci
+ * @requires vm.jvmci & !vm.graal.enabled
* @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
@@ -47,10 +47,6 @@
* compiler.jvmci.common.JVMCIHelpers$EmptyCompilationRequestResult
* compiler.jvmci.common.JVMCIHelpers$EmptyVMEventListener
* @run main/othervm -XX:+UnlockExperimentalVMOptions
- * -Djvmci.Compiler=graal -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