8251384: [TESTBUG] jvmti tests should not be executed with minimal VM

Reviewed-by: sspitsyn, iignatyev

src/hotspot/share/prims/whitebox.cpp

@@ -2282,6 +2282,10 @@ WB_ENTRY(void, WB_CheckThreadObjOfTerminatingThread(JNIEnv* env, jobject wb, job
   }
 WB_END
 
+WB_ENTRY(jboolean, WB_IsJVMTIIncluded(JNIEnv* env, jobject wb))
+  return INCLUDE_JVMTI ? JNI_TRUE : JNI_FALSE;
+WB_END
+
 #define CC (char*)
 
 static JNINativeMethod methods[] = {
@@ -2533,6 +2537,7 @@ static JNINativeMethod methods[] = {
   {CC"protectionDomainRemovedCount",   CC"()I",       (void*)&WB_ProtectionDomainRemovedCount },
   {CC"aotLibrariesCount", CC"()I",                    (void*)&WB_AotLibrariesCount },
   {CC"getKlassMetadataSize", CC"(Ljava/lang/Class;)I",(void*)&WB_GetKlassMetadataSize},
+  {CC"isJVMTIIncluded", CC"()Z",                      (void*)&WB_IsJVMTIIncluded},
 };
 
 

test/hotspot/jtreg/TEST.ROOT

@@ -68,6 +68,7 @@ requires.properties= \
     vm.cds \
     vm.cds.custom.loaders \
     vm.cds.archived.java.heap \
+    vm.jvmti \
     vm.graal.enabled \
     vm.compiler1.enabled \
     vm.compiler2.enabled \

test/hotspot/jtreg/serviceability/jvmti/8036666/GetObjectLockCount.java

@@ -61,6 +61,7 @@
  * @test GetObjectLockCount.java
  * @bug 8036666
  * @summary verify jvm returns correct lock recursion count
+ * @requires vm.jvmti
  * @run compile -g RecursiveObjectLock.java
  * @run main/othervm GetObjectLockCount
  * @author axel.siebenborn@sap.com

test/hotspot/jtreg/serviceability/jvmti/AddModuleExportsAndOpens/MyPackage/AddModuleExportsAndOpensTest.java

@@ -26,6 +26,7 @@
 /**
  * @test
  * @summary Verifies the JVMTI AddModuleExports and AddModuleOpens API
+ * @requires vm.jvmti
  * @compile AddModuleExportsAndOpensTest.java
  * @run main/othervm/native -agentlib:AddModuleExportsAndOpensTest MyPackage.AddModuleExportsAndOpensTest
  */

test/hotspot/jtreg/serviceability/jvmti/AddModuleReads/MyPackage/AddModuleReadsTest.java

@@ -26,6 +26,7 @@
 /**
  * @test
  * @summary Verifies the JVMTI AddModuleReads API
+ * @requires vm.jvmti
  * @compile AddModuleReadsTest.java
  * @run main/othervm/native -agentlib:AddModuleReadsTest MyPackage.AddModuleReadsTest
  */

test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides/MyPackage/AddModuleUsesAndProvidesTest.java

@@ -26,6 +26,7 @@
 /**
  * @test
  * @summary Basic test for JVMTI AddModuleUses and AddModuleProvides
+ * @requires vm.jvmti
  * @build java.base/java.lang.TestProvider
  *        java.base/jdk.internal.test.TestProviderImpl
  * @compile AddModuleUsesAndProvidesTest.java

test/hotspot/jtreg/serviceability/jvmti/CompiledMethodLoad/Zombie.java

@@ -25,6 +25,7 @@
  * @test
  * @bug 8212159
  * @summary Generate compiled method load events without crashing
+ * @requires vm.jvmti
  * @run main/othervm/native -agentlib:CompiledZombie -Xcomp -XX:ReservedCodeCacheSize=50m Zombie
  **/
 

test/hotspot/jtreg/serviceability/jvmti/FieldAccessWatch/FieldAccessWatch.java

@@ -26,6 +26,7 @@
  * @bug 8193369
  * @summary Tests that all FieldAccess and FieldModification notifications
             are generated.
+ * @requires vm.jvmti
  * @compile FieldAccessWatch.java
  * @run main/othervm/native -agentlib:FieldAccessWatch FieldAccessWatch
  */

test/hotspot/jtreg/serviceability/jvmti/GenerateEvents/MyPackage/GenerateEventsTest.java

@@ -25,6 +25,7 @@
  * @test
  * @bug 8222072
  * @summary Send CompiledMethodLoad events only to the environment requested it with GenerateEvents
+ * @requires vm.jvmti
  * @compile GenerateEventsTest.java
  * @run main/othervm/native -agentlib:GenerateEvents1 -agentlib:GenerateEvents2 MyPackage.GenerateEventsTest
  */

test/hotspot/jtreg/serviceability/jvmti/GetClassMethods/OverpassMethods.java

@@ -27,6 +27,7 @@
  * @test
  * @bug 8216324
  * @summary GetClassMethods is confused by the presence of default methods in super interfaces
+ * @requires vm.jvmti
  * @library /test/lib
  * @compile OverpassMethods.java
  * @run main/othervm/native -agentlib:OverpassMethods OverpassMethods

test/hotspot/jtreg/serviceability/jvmti/GetLocalVariable/GetLocalVars.java

@@ -25,7 +25,7 @@
  * @test
  * @bug 8080406
  * @summary VM_GetOrSetLocal doesn't check local slot type against requested type
- *
+ * @requires vm.jvmti
  * @compile GetLocalVars.java
  * @run main/othervm/native -Xcomp -agentlib:GetLocalVars GetLocalVars
  */

test/hotspot/jtreg/serviceability/jvmti/GetModulesInfo/JvmtiGetAllModulesTest.java

@@ -24,6 +24,7 @@
 /**
  * @test
  * @summary Verifies the JVMTI GetAllModules API
+ * @requires vm.jvmti
  * @library /test/lib
  * @run main/othervm/native -agentlib:JvmtiGetAllModulesTest JvmtiGetAllModulesTest
  *

test/hotspot/jtreg/serviceability/jvmti/GetNamedModule/MyPackage/GetNamedModuleTest.java

@@ -26,6 +26,7 @@
 /**
  * @test
  * @summary Verifies the JVMTI GetNamedModule API
+ * @requires vm.jvmti
  * @compile GetNamedModuleTest.java
  * @run main/othervm/native -agentlib:GetNamedModuleTest MyPackage.GetNamedModuleTest
  */

test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeClass.java

@@ -30,6 +30,7 @@
  * @test
  * @bug 8075030
  * @summary JvmtiEnv::GetObjectSize reports incorrect java.lang.Class instance size
+ * @requires vm.jvmti
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.compiler

test/hotspot/jtreg/serviceability/jvmti/GetObjectSizeOverflow.java

@@ -33,6 +33,7 @@
  *          java.management
  *          jdk.internal.jvmstat/sun.jvmstat.monitor
  * @requires vm.bits == 64
+ * @requires vm.jvmti
  * @build GetObjectSizeOverflowAgent
  * @run driver ClassFileInstaller GetObjectSizeOverflowAgent
  * @run main GetObjectSizeOverflow

test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoTest.java

@@ -26,6 +26,7 @@
  * @test
  * @bug 8185164
  * @summary Checks that a contended monitor does not show up in the list of owned monitors
+ * @requires vm.jvmti
  * @compile GetOwnedMonitorInfoTest.java
  * @run main/othervm/native -agentlib:GetOwnedMonitorInfoTest GetOwnedMonitorInfoTest
  */

test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo/GetOwnedMonitorInfoWithEATest.java

@@ -27,6 +27,7 @@
  * @summary Test JVMTI's GetOwnedMonitorInfo with scalar replaced objects and eliminated locks on stack (optimizations based on escape analysis).
  * @comment Without RFE 8227745 escape analysis needs to be switched off to pass the test. For the implementation of RFE 8227745 it serves as a regression test.
  * @requires (vm.compMode != "Xcomp" & vm.compiler2.enabled)
+ * @requires vm.jvmti
  * @library /test/lib
  * @compile GetOwnedMonitorInfoWithEATest.java
  * @run main/othervm/native

test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorStackDepthInfo/GetOwnedMonitorStackDepthInfoTest.java

@@ -26,6 +26,7 @@
  * @test
  * @bug 8153629
  * @summary Need to cover JVMTI's GetOwnedMonitorStackDepthInfo function
+ * @requires vm.jvmti
  * @compile GetOwnedMonitorStackDepthInfoTest.java
  * @run main/othervm/native -agentlib:GetOwnedMonitorStackDepthInfoTest GetOwnedMonitorStackDepthInfoTest
  */

test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorStackDepthInfo/GetOwnedMonitorStackDepthInfoWithEATest.java

@@ -27,6 +27,7 @@
  * @summary Test JVMTI's GetOwnedMonitorStackDepthInfo with scalar replaced objects and eliminated locks on stack (optimizations based on escape analysis).
  * @comment Without RFE 8227745 escape analysis needs to be switched off to pass the test. For the implementation of RFE 8227745 it serves as a regression test.
  * @requires (vm.compMode != "Xcomp" & vm.compiler2.enabled)
+ * @requires vm.jvmti
  * @library /test/lib
  * @compile GetOwnedMonitorStackDepthInfoWithEATest.java
  * @run main/othervm/native

test/hotspot/jtreg/serviceability/jvmti/GetSystemProperty/JvmtiGetSystemPropertyTest.java

@@ -25,6 +25,7 @@
  * @test
  * @bug 8203329
  * @summary Verifies the JVMTI GetSystemProperty API returns the updated java.vm.info value
+ * @requires vm.jvmti
  * @library /test/lib
  * @run main/othervm/native -agentlib:JvmtiGetSystemPropertyTest JvmtiGetSystemPropertyTest
  *

test/hotspot/jtreg/serviceability/jvmti/GetThreadListStackTraces/OneGetThreadListStackTraces.java

@@ -26,6 +26,7 @@
  * @test
  * @bug 8242428
  * @summary Verifies JVMTI GetThreadListStackTraces API with thread_count = 1
+ * @requires vm.jvmti
  * @library /test/lib
  * @run main/othervm/native -agentlib:OneGetThreadListStackTraces OneGetThreadListStackTraces
  *

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorArrayAllSampledTest.java

@@ -28,6 +28,7 @@
  * @test
  * @build Frame HeapMonitor
  * @summary Verifies the JVMTI Heap Monitor interval when allocating arrays.
+ * @requires vm.jvmti
  * @compile HeapMonitorArrayAllSampledTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorArrayAllSampledTest
  */

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorEventOnOffTest.java

@@ -29,6 +29,7 @@
 /**
  * @test
  * @summary Verifies if turning off the event notification stops events.
+ * @requires vm.jvmti
  * @build Frame HeapMonitor
  * @compile HeapMonitorEventOnOffTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorEventOnOffTest

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorGCParallelTest.java

@@ -30,5 +30,6 @@
  * @build Frame HeapMonitor
  * @compile HeapMonitorGCTest.java
  * @requires vm.gc == "Parallel" | vm.gc == "null"
+ * @requires vm.jvmti
  * @run main/othervm/native -agentlib:HeapMonitorTest -XX:+UseParallelGC MyPackage.HeapMonitorGCTest
  */

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorGCSerialTest.java

@@ -30,5 +30,6 @@
  * @build Frame HeapMonitor
  * @compile HeapMonitorGCTest.java
  * @requires vm.gc == "Serial" | vm.gc == "null"
+ * @requires vm.jvmti
  * @run main/othervm/native -agentlib:HeapMonitorTest -XX:+UseSerialGC MyPackage.HeapMonitorGCTest
  */

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorGCTest.java

@@ -32,6 +32,7 @@
  * @summary Verifies the default GC with the Heap Monitor event system.
  * @compile HeapMonitorGCTest.java
  * @requires vm.gc == "G1" | vm.gc == "null"
+ * @requires vm.jvmti
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorGCTest
  */
 

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorIllegalArgumentTest.java

@@ -27,6 +27,7 @@
 /**
  * @test
  * @summary Verifies the JVMTI SetHeapSamplingInterval returns an illegal argument for negative ints.
+ * @requires vm.jvmti
  * @build Frame HeapMonitor
  * @compile HeapMonitorIllegalArgumentTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorIllegalArgumentTest

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorInitialAllocationTest.java

@@ -27,6 +27,7 @@
 /**
  * @test
  * @summary Verifies the JVMTI Heap Monitor does not always sample the first object.
+ * @requires vm.jvmti
  * @build Frame HeapMonitor
  * @compile HeapMonitorInitialAllocationTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorInitialAllocationTest

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorInterpreterArrayTest.java

@@ -27,6 +27,7 @@
 /**
  * @test
  * @summary Verifies the JVMTI Heap Monitor using the interpreter.
+ * @requires vm.jvmti
  * @build Frame HeapMonitor
  * @compile HeapMonitorTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest -Xint MyPackage.HeapMonitorTest 10

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorInterpreterObjectTest.java

@@ -27,6 +27,7 @@
 /**
  * @test
  * @summary Verifies the JVMTI Heap Monitor using the interpreter.
+ * @requires vm.jvmti
  * @build Frame HeapMonitor
  * @compile HeapMonitorStatObjectCorrectnessTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest -Xint MyPackage.HeapMonitorStatObjectCorrectnessTest

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorMultiArrayTest.java

@@ -29,6 +29,7 @@
 /**
  * @test
  * @summary Verifies the JVMTI Heap Monitor API when allocating a multi-array.
+ * @requires vm.jvmti
  * @build Frame HeapMonitor
  * @compile HeapMonitorMultiArrayTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorMultiArrayTest

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorNoCapabilityTest.java

@@ -27,6 +27,7 @@
 /**
  * @test
  * @summary Verifies the JVMTI Heap Monitor does not work without the required capability.
+ * @requires vm.jvmti
  * @build Frame HeapMonitor
  * @compile HeapMonitorNoCapabilityTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorNoCapabilityTest

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorRecursiveTest.java

@@ -29,6 +29,7 @@
 /**
  * @test
  * @summary Verifies the JVMTI Heap Monitor API does not do infinite recursion.
+ * @requires vm.jvmti
  * @build Frame HeapMonitor
  * @compile HeapMonitorRecursiveTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorRecursiveTest

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatArrayCorrectnessTest.java

@@ -28,6 +28,7 @@
  * @test
  * @build Frame HeapMonitor
  * @summary Verifies the JVMTI Heap Monitor interval when allocating arrays.
+ * @requires vm.jvmti
  * @compile HeapMonitorStatArrayCorrectnessTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorStatArrayCorrectnessTest
  */

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatIntervalTest.java

@@ -29,6 +29,7 @@
  * @summary Verifies the JVMTI Heap Monitor sampling interval average.
  * @build Frame HeapMonitor
  * @compile HeapMonitorStatIntervalTest.java
+ * @requires vm.jvmti
  * @requires vm.compMode != "Xcomp"
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorStatIntervalTest
  */

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatObjectCorrectnessTest.java

@@ -28,6 +28,7 @@
  * @test
  * @build Frame HeapMonitor
  * @summary Verifies the JVMTI Heap Monitor sampling via object allocation.
+ * @requires vm.jvmti
  * @compile HeapMonitorStatObjectCorrectnessTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorStatObjectCorrectnessTest
  */

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatSimpleTest.java

@@ -27,6 +27,7 @@
 /**
  * @test
  * @build Frame HeapMonitor
+ * @requires vm.jvmti
  * @summary Verifies the JVMTI Heap Monitor events are only sent after enabling.
  * @compile HeapMonitorStatSimpleTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorStatSimpleTest

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorTest.java

@@ -27,6 +27,7 @@
 /**
  * @test
  * @summary Verifies the JVMTI Heap Monitor API
+ * @requires vm.jvmti
  * @build Frame HeapMonitor
  * @compile HeapMonitorTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorTest

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorThreadDisabledTest.java

@@ -28,6 +28,7 @@
  * @test
  * @build Frame HeapMonitor ThreadInformation
  * @summary Verifies the JVMTI Heap Monitor Thread can disable events for a given thread.
+ * @requires vm.jvmti
  * @compile HeapMonitorThreadDisabledTest.java
  * @run main/othervm/native -Xmx512m -agentlib:HeapMonitorTest MyPackage.HeapMonitorThreadDisabledTest
  */

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorThreadOnOffTest.java

@@ -28,6 +28,7 @@
  * @test
  * @build Frame HeapMonitor
  * @summary Verifies the JVMTI Heap Monitor Thread sanity.
+ * @requires vm.jvmti
  * @compile HeapMonitorThreadOnOffTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorThreadOnOffTest
  */

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorThreadTest.java

@@ -28,6 +28,7 @@
  * @test
  * @build Frame HeapMonitor ThreadInformation
  * @summary Verifies the JVMTI Heap Monitor Thread information sanity.
+ * @requires vm.jvmti
  * @compile HeapMonitorThreadTest.java
  * @run main/othervm/native -Xmx512m -agentlib:HeapMonitorTest MyPackage.HeapMonitorThreadTest
  */

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorTwoAgentsTest.java

@@ -28,6 +28,7 @@
  * @test
  * @build Frame HeapMonitor ThreadInformation
  * @summary Verifies the JVMTI Heap Monitor does not work with two agents.
+ * @requires vm.jvmti
  * @compile HeapMonitorTwoAgentsTest.java
  * @run main/othervm/native -agentlib:HeapMonitorTest MyPackage.HeapMonitorTwoAgentsTest
  */

test/hotspot/jtreg/serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorVMEventsTest.java

@@ -33,6 +33,7 @@
  * @summary Verifies that when the VM event is sent, sampled events are also collected.
  * @build Frame HeapMonitor
  * @compile HeapMonitorVMEventsTest.java
+ * @requires vm.jvmti
  * @requires !vm.graal.enabled
  * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions
  *                          -XX:DisableIntrinsic=_clone

test/hotspot/jtreg/serviceability/jvmti/HiddenClass/P/Q/HiddenClassSigTest.java

@@ -23,6 +23,7 @@
 
 /**
  * @test
+ * @requires vm.jvmti
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.compiler