--- a/make/autoconf/hotspot.m4	Fri Jul 20 09:33:49 2018 +0200
+++ b/make/autoconf/hotspot.m4	Fri Jul 20 09:46:57 2018 +0200
@@ -331,8 +331,10 @@
 
   # Enable JFR by default, except for Zero, linux-sparcv9 and on minimal.
   if ! HOTSPOT_CHECK_JVM_VARIANT(zero); then
-    if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then
-      NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr"
+    if test "x$OPENJDK_TARGET_OS" != xaix; then
+      if test "x$OPENJDK_TARGET_OS" != xlinux || test "x$OPENJDK_TARGET_CPU" != xsparcv9; then
+        NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jfr"
+      fi
     fi
   fi
 
@@ -459,7 +461,7 @@
       JVM_FEATURES_aot="aot"
     fi
   else
-    if test "x$enable_aot" = "xno" || "x$DISABLE_AOT" = "xaot"; then
+    if test "x$enable_aot" = "xno" || test "x$DISABLE_AOT" = "xaot"; then
       AC_MSG_RESULT([no, forced])
     else
       AC_MSG_RESULT([no])

--- a/src/hotspot/share/prims/whitebox.cpp	Fri Jul 20 09:33:49 2018 +0200
+++ b/src/hotspot/share/prims/whitebox.cpp	Fri Jul 20 09:46:57 2018 +0200
@@ -1785,6 +1785,14 @@
 WB_END
 
 
+WB_ENTRY(jboolean, WB_IsJFRIncludedInVmBuild(JNIEnv* env))
+#if INCLUDE_JFR
+  return true;
+#else
+  return false;
+#endif // INCLUDE_JFR
+WB_END
+
 #if INCLUDE_CDS
 
 WB_ENTRY(jint, WB_GetOffsetForName(JNIEnv* env, jobject o, jstring name))
@@ -2163,6 +2171,7 @@
   {CC"getResolvedReferences", CC"(Ljava/lang/Class;)Ljava/lang/Object;", (void*)&WB_GetResolvedReferences},
   {CC"areOpenArchiveHeapObjectsMapped",   CC"()Z",    (void*)&WB_AreOpenArchiveHeapObjectsMapped},
   {CC"isCDSIncludedInVmBuild",            CC"()Z",    (void*)&WB_IsCDSIncludedInVmBuild },
+  {CC"isJFRIncludedInVmBuild",            CC"()Z",    (void*)&WB_IsJFRIncludedInVmBuild },
   {CC"isJavaHeapArchiveSupported",      CC"()Z",      (void*)&WB_IsJavaHeapArchiveSupported },
 
   {CC"clearInlineCaches0",  CC"(Z)V",                 (void*)&WB_ClearInlineCaches },

--- a/test/hotspot/jtreg/TEST.ROOT	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/hotspot/jtreg/TEST.ROOT	Fri Jul 20 09:46:57 2018 +0200
@@ -54,6 +54,7 @@
     vm.debug \
     vm.hasSA \
     vm.hasSAandCanAttach \
+    vm.hasJFR \
     vm.rtm.cpu \
     vm.rtm.os \
     vm.aot \

--- a/test/hotspot/jtreg/runtime/appcds/CDSandJFR.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/hotspot/jtreg/runtime/appcds/CDSandJFR.java	Fri Jul 20 09:46:57 2018 +0200
@@ -22,10 +22,10 @@
  *
  */
 
-/*
+/**
  * @test
  * @summary Make sure CDS and JFR work together.
- * @requires vm.cds
+ * @requires vm.hasJFR & vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/appcds /test/hotspot/jtreg/runtime/appcds/test-classes test-classes
  * @modules jdk.jfr
  * @build Hello GetFlightRecorder

--- a/test/hotspot/jtreg/runtime/appcds/TestWithProfiler.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/hotspot/jtreg/runtime/appcds/TestWithProfiler.java	Fri Jul 20 09:46:57 2018 +0200
@@ -22,14 +22,14 @@
  *
  */
 
-/*
+/**
  * @test
  * @bug 8145221
  * @summary After creating an AppCDS archive, run the test with the JFR profiler
  *          enabled, and keep calling a method in the archive in a tight loop.
  *          This is to test the safe handling of trampoline functions by the
  *          profiler.
- * @requires vm.cds
+ * @requires vm.hasJFR & vm.cds
  * @library /test/lib /test/hotspot/jtreg/runtime/appcds
  * @modules java.base/jdk.internal.misc
  *          java.management

--- a/test/hotspot/jtreg/runtime/appcds/sharedStrings/FlagCombo.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/hotspot/jtreg/runtime/appcds/sharedStrings/FlagCombo.java	Fri Jul 20 09:46:57 2018 +0200
@@ -22,10 +22,10 @@
  *
  */
 
-/*
+/**
  * @test
  * @summary Test relevant combinations of command line flags with shared strings
- * @requires vm.cds.archived.java.heap
+ * @requires vm.cds.archived.java.heap & vm.hasJFR
  * @library /test/lib /test/hotspot/jtreg/runtime/appcds
  * @modules java.base/jdk.internal.misc
  * @modules java.management
@@ -34,7 +34,21 @@
  * @run main FlagCombo
  */
 
+/**
+ * @test
+ * @summary Test relevant combinations of command line flags with shared strings
+ * @comment A special test excluding the case that requires JFR
+ * @requires vm.cds.archived.java.heap & !vm.hasJFR
+ * @library /test/lib /test/hotspot/jtreg/runtime/appcds
+ * @modules java.base/jdk.internal.misc
+ * @modules java.management
+ *          jdk.jartool/sun.tools.jar
+ * @build HelloString
+ * @run main FlagCombo noJfr
+ */
+
 import jdk.test.lib.BuildHelper;
+import jdk.test.lib.Platform;
 
 public class FlagCombo {
     public static void main(String[] args) throws Exception {
@@ -45,8 +59,10 @@
 
         SharedStringsUtils.runWithArchive("HelloString", "-XX:+UseG1GC");
 
-        SharedStringsUtils.runWithArchiveAuto("HelloString",
-           "-XX:StartFlightRecording=dumponexit=true");
+        if (args.length == 0) {
+            SharedStringsUtils.runWithArchiveAuto("HelloString",
+                "-XX:StartFlightRecording=dumponexit=true");
+        }
 
         SharedStringsUtils.runWithArchive("HelloString", "-XX:+UnlockDiagnosticVMOptions",
            "-XX:NativeMemoryTracking=detail", "-XX:+PrintNMTStatistics");

--- a/test/jdk/TEST.ROOT	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/TEST.ROOT	Fri Jul 20 09:46:57 2018 +0200
@@ -42,6 +42,7 @@
     vm.cds \
     vm.hasSA \
     vm.hasSAandCanAttach \
+    vm.hasJFR \
     docker.support \
     release.implementor
 

--- a/test/jdk/jdk/jfr/api/consumer/TestFieldAccess.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestFieldAccess.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestFieldAccess
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestGetStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestGetStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -42,10 +42,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/*
+/**
  * @test
  * @summary Verifies that a recorded JFR event has the correct stack trace info
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestGetStackTrace
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestHiddenMethod.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestHiddenMethod.java	Fri Jul 20 09:46:57 2018 +0200
@@ -42,9 +42,10 @@
 import jdk.test.lib.jfr.Events;
 
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @library /test/lib
  * @modules java.scripting

--- a/test/jdk/jdk/jfr/api/consumer/TestMethodGetModifiers.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestMethodGetModifiers.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,9 +39,10 @@
 import jdk.test.lib.jfr.SimpleEvent;
 
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm -Xint jdk.jfr.api.consumer.TestMethodGetModifiers
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestReadTwice.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestReadTwice.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,10 +38,11 @@
 import jdk.test.lib.Utils;
 
 
-/*
+/**
  * @test
  * @summary Reads the recorded file two times and verifies that both reads are the same
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestReadTwice
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestRecordedClassLoader.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedClassLoader.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.TestClassLoader;
 
-/*
+/**
  * @test
  * @summary Verifies the methods of the RecordedClassLoader
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedClassLoader
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestRecordedEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Verifies the methods of the RecordedEvent
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedEvent
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestRecordedEventGetThread.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedEventGetThread.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,10 +34,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/*
+/**
  * @test
  * @summary Tests that the RecordedEvent.getThread() returns th expected info
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedEventGetThread
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestRecordedEventGetThreadOther.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedEventGetThreadOther.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.Utils;
 
-/*
+/**
  * @test
  * @summary Tests that the RecordedEvent.getThread() returns th expected info
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedEventGetThreadOther
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestRecordedFrame.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedFrame.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.jfr.SimpleEvent;
 
 
-/*
+/**
  * @test
  * @summary Simple test for RecordedFrame APIs
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm -Xint  -XX:+UseInterpreter -Dinterpreted=true  jdk.jfr.api.consumer.TestRecordedFrame
  * @run main/othervm -Xcomp -XX:-UseInterpreter -Dinterpreted=false jdk.jfr.api.consumer.TestRecordedFrame

--- a/test/jdk/jdk/jfr/api/consumer/TestRecordedFullStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedFullStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -40,9 +40,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.RecurseThread;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedFullStackTrace
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestRecordedInstantEventTimestamp.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedInstantEventTimestamp.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/*
+/**
  * @test
  * @summary Tests that an instant event gets recorded with its start time equal to its end time
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedInstantEventTimestamp
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestRecordedMethodDescriptor.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedMethodDescriptor.java	Fri Jul 20 09:46:57 2018 +0200
@@ -40,9 +40,10 @@
 import jdk.test.lib.jfr.Events;
 
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedMethodDescriptor
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestRecordedObject.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedObject.java	Fri Jul 20 09:46:57 2018 +0200
@@ -47,10 +47,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Verifies the methods of the RecordedObject
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedObject
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestRecordedThreadGroupParent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordedThreadGroupParent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/*
+/**
  * @test
  * @summary Tests getParent method in RecordedThreadGroup
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedThreadGroupParent
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestRecordingFile.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordingFile.java	Fri Jul 20 09:46:57 2018 +0200
@@ -49,10 +49,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.Utils;
 
-/*
+/**
  * @test
  * @summary Verifies that all methods in RecordingFIle are working
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestRecordingFile
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestRecordingFileReadEventEof.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordingFileReadEventEof.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/*
+/**
  * @test
  * @summary Verifies that RecordingFile.readEvent() throws EOF when past the last record
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestRecordingFileReadEventEof
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestRecordingInternals.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestRecordingInternals.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,10 +32,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/*
+/**
  * @test
  * @summary Tests that chunks are read in order and constant pools from multiple chunks can be read
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestRecordingInternals
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestSingleRecordedEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestSingleRecordedEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,10 +34,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Verifies that a single JFR event is recorded as expected
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestSingleRecordedEvent
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestToString.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestToString.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,10 +34,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Sanity checks that RecordedEvent#toString returns something valid
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.consumer.TestToString
  */

--- a/test/jdk/jdk/jfr/api/consumer/TestValueDescriptorRecorded.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/consumer/TestValueDescriptorRecorded.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.jfr.Events;
 
 
-/*
+/**
  * @test
  * @summary Verifies that the recorded value descriptors are correct
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm  jdk.jfr.api.consumer.TestValueDescriptorRecorded
  */

--- a/test/jdk/jdk/jfr/api/event/TestAbstractEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestAbstractEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Tests that abstract events are not part of metadata
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestAbstractEvent
  */

--- a/test/jdk/jdk/jfr/api/event/TestBeginEnd.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestBeginEnd.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,10 +32,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/*
+/**
  * @test
  * @summary Test for RecordedEvent.getDuration()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestBeginEnd
  */

--- a/test/jdk/jdk/jfr/api/event/TestClinitRegistration.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestClinitRegistration.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test enable/disable event and verify recording has expected events.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestClinitRegistration
  */

--- a/test/jdk/jdk/jfr/api/event/TestClonedEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestClonedEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,10 +35,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Tests that a cloned event can be successfully committed.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestClonedEvent
  */

--- a/test/jdk/jdk/jfr/api/event/TestEnableDisable.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestEnableDisable.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test enable/disable event and verify recording has expected events.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestEnableDisable
  */

--- a/test/jdk/jdk/jfr/api/event/TestEventFactory.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestEventFactory.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.Asserts;
 
 
-/*
+/**
  * @test
  * @summary EventFactory simple test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestEventFactory
  */

--- a/test/jdk/jdk/jfr/api/event/TestEventFactoryRegisterTwice.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestEventFactoryRegisterTwice.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.test.lib.Asserts;
 
 
-/*
+/**
  * @test
  * @summary Verifies that EventFactory can register the same event twice
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestEventFactoryRegisterTwice
  */

--- a/test/jdk/jdk/jfr/api/event/TestEventFactoryRegistration.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestEventFactoryRegistration.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.Asserts;
 
 
-/*
+/**
  * @test
  * @summary EventFactory register/unregister API test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestEventFactoryRegistration
  */

--- a/test/jdk/jdk/jfr/api/event/TestExtends.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestExtends.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test with event class inheritance
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestExtends
  */

--- a/test/jdk/jdk/jfr/api/event/TestGetDuration.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestGetDuration.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/*
+/**
  * @test
  * @summary Test for RecordedEvent.getDuration()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestGetDuration
  */

--- a/test/jdk/jdk/jfr/api/event/TestIsEnabled.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestIsEnabled.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,10 +30,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/*
+/**
  * @test
  * @summary Test Event.isEnabled()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestIsEnabled
  */

--- a/test/jdk/jdk/jfr/api/event/TestIsEnabledMultiple.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestIsEnabledMultiple.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,10 +30,11 @@
 import jdk.jfr.Recording;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test Event.isEnabled() with multiple recordings
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestIsEnabledMultiple
  */

--- a/test/jdk/jdk/jfr/api/event/TestOwnCommit.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestOwnCommit.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,10 +34,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Use custom event that reuse method names begin, end and commit.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestOwnCommit
  */

--- a/test/jdk/jdk/jfr/api/event/TestShouldCommit.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestShouldCommit.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.jfr.Recording;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test enable/disable event and verify recording has expected events.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm -Xlog:jfr+event+setting=trace jdk.jfr.api.event.TestShouldCommit
  */

--- a/test/jdk/jdk/jfr/api/event/TestStaticEnable.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/TestStaticEnable.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Enable an event from a static function in the event.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.TestStaticEnable
  */

--- a/test/jdk/jdk/jfr/api/event/dynamic/TestDynamicAnnotations.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/dynamic/TestDynamicAnnotations.java	Fri Jul 20 09:46:57 2018 +0200
@@ -51,9 +51,10 @@
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.dynamic.TestDynamicAnnotations
  */

--- a/test/jdk/jdk/jfr/api/event/dynamic/TestEventFactory.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/event/dynamic/TestEventFactory.java	Fri Jul 20 09:46:57 2018 +0200
@@ -53,9 +53,10 @@
 import jdk.test.lib.jfr.Events;
 
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.event.dynamic.TestEventFactory
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestAddListenerTwice.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestAddListenerTwice.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,9 +29,10 @@
 import jdk.jfr.Recording;
 import jdk.jfr.RecordingState;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.flightrecorder.TestAddListenerTwice
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestAddPeriodicEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestAddPeriodicEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,10 +35,11 @@
 import jdk.jfr.FlightRecorder;
 import jdk.jfr.Recording;
 
-/*
+/**
  * @test
  * @summary
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.flightrecorder.TestAddPeriodicEvent
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestFlightRecorderListenerRecorderInitialized.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestFlightRecorderListenerRecorderInitialized.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.jfr.FlightRecorder;
 import jdk.jfr.FlightRecorderListener;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.flightrecorder.TestFlightRecorderListenerRecorderInitialized
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestGetEventTypes.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestGetEventTypes.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,10 @@
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm/timeout=600 jdk.jfr.api.flightrecorder.TestGetEventTypes
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestGetPlatformRecorder.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestGetPlatformRecorder.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,9 +29,10 @@
 
 import jdk.jfr.FlightRecorder;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.flightrecorder.TestGetPlatformRecorder
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestGetRecordings.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestGetRecordings.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.jfr.FlightRecorder;
 import jdk.jfr.Recording;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.flightrecorder.TestGetRecordings
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestGetSettings.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestGetSettings.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,10 @@
 import jdk.jfr.EventType;
 import jdk.jfr.Recording;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.flightrecorder.TestGetSettings
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestIsAvailable.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestIsAvailable.java	Fri Jul 20 09:46:57 2018 +0200
@@ -28,9 +28,10 @@
 import jdk.jfr.FlightRecorder;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm -XX:+FlightRecorder jdk.jfr.api.flightrecorder.TestIsAvailable true
  * @run main/othervm -XX:-FlightRecorder jdk.jfr.api.flightrecorder.TestIsAvailable  false

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestIsInitialized.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestIsInitialized.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,9 +29,10 @@
 import jdk.jfr.FlightRecorderListener;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.flightrecorder.TestIsInitialized
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestListener.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestListener.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,9 +29,10 @@
 import jdk.jfr.Recording;
 import jdk.jfr.RecordingState;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.flightrecorder.TestListener
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestListenerNull.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestListenerNull.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,9 +29,10 @@
 
 import jdk.jfr.FlightRecorder;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.flightrecorder.TestListenerNull
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestPeriodicEventsSameHook.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestPeriodicEventsSameHook.java	Fri Jul 20 09:46:57 2018 +0200
@@ -28,10 +28,11 @@
 import jdk.jfr.Event;
 import jdk.jfr.FlightRecorder;
 
-/*
+/**
  * @test
  * @summary Check that an IllegalArgumentException is thrown if event is added twice
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.flightrecorder.TestPeriodicEventsSameHook
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestRecorderInitializationCallback.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestRecorderInitializationCallback.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,10 +32,11 @@
 import jdk.jfr.FlightRecorder;
 import jdk.jfr.FlightRecorderListener;
 
-/*
+/**
  * @test
  * @summary Test Flight Recorder initialization callback is only called once
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.flightrecorder.TestRecorderInitializationCallback
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestRegisterUnregisterEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestRegisterUnregisterEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.jfr.EventType;
 import jdk.jfr.FlightRecorder;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.flightrecorder.TestRegisterUnregisterEvent
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestSettingsControl.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestSettingsControl.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.jfr.SettingControl;
 import jdk.jfr.SettingDefinition;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.flightrecorder.TestSettingsControl
  */

--- a/test/jdk/jdk/jfr/api/flightrecorder/TestSnapshot.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/flightrecorder/TestSnapshot.java	Fri Jul 20 09:46:57 2018 +0200
@@ -40,8 +40,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/* @test
+/**
+ * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.flightrecorder.TestSnapshot
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestCategory.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestCategory.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,10 @@
 import jdk.jfr.EventType;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestCategory
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestContentType.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestContentType.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,9 +39,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestContentType
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestDescription.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestDescription.java	Fri Jul 20 09:46:57 2018 +0200
@@ -41,9 +41,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleSetting;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestDescription
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestDynamicAnnotation.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestDynamicAnnotation.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.jfr.AnnotationElement;
 import jdk.jfr.MetadataDefinition;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestDynamicAnnotation
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestEnabled.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestEnabled.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.jfr.Recording;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestEnabled
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestExperimental.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestExperimental.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestExperimental
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestFieldAnnotations.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestFieldAnnotations.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,9 +39,10 @@
 import jdk.jfr.ValueDescriptor;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestFieldAnnotations
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestHasValue.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestHasValue.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.jfr.Timestamp;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestHasValue
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestInheritedAnnotations.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestInheritedAnnotations.java	Fri Jul 20 09:46:57 2018 +0200
@@ -48,9 +48,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestInheritedAnnotations
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestLabel.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestLabel.java	Fri Jul 20 09:46:57 2018 +0200
@@ -42,9 +42,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleSetting;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestLabel
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestMetadata.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestMetadata.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestMetadata
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestName.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestName.java	Fri Jul 20 09:46:57 2018 +0200
@@ -42,9 +42,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleSetting;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestName
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestPeriod.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestPeriod.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestLabel
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestRegistered.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestRegistered.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.jfr.EventType;
 import jdk.jfr.FlightRecorder;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestRegistered
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestRegisteredFalseAndRunning.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestRegisteredFalseAndRunning.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,9 +29,10 @@
 import jdk.jfr.Recording;
 import jdk.jfr.Registered;
 
-/*
+/**
  * @test Tests that commit doesn't throw exception when an event has not been registered.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestRegisteredFalseAndRunning
  * @run main/othervm -XX:FlightRecorderOptions=retransform=false jdk.jfr.api.metadata.annotations.TestRegisteredFalseAndRunning

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestRelational.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestRelational.java	Fri Jul 20 09:46:57 2018 +0200
@@ -40,9 +40,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestRelational
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestSimpleMetadataEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestSimpleMetadataEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.jfr.EventType;
 import jdk.jfr.MetadataDefinition;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestSimpleMetadataEvent
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestStackTrace
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestThreshold.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestThreshold.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestThreshold
  */

--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestTypesIdentical.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestTypesIdentical.java	Fri Jul 20 09:46:57 2018 +0200
@@ -51,9 +51,10 @@
 import jdk.jfr.Unsigned;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestTypesIdentical
  */

--- a/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetAnnotation.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetAnnotation.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,10 +35,11 @@
 import jdk.jfr.Label;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test getAnnotations()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetAnnotation
  */

--- a/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetAnnotationElements.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetAnnotationElements.java	Fri Jul 20 09:46:57 2018 +0200
@@ -62,10 +62,11 @@
 import jdk.jfr.ValueDescriptor;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test for AnnotationElement.getAnnotationElements()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetAnnotationElements
  */

--- a/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetAnnotations.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetAnnotations.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.jfr.Period;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test getAnnotations()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetAnnotations
  */

--- a/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetCategory.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetCategory.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,10 +32,11 @@
 import jdk.jfr.EventType;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test setName().
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetCategory
  */

--- a/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetDefaultValues.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetDefaultValues.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test getDefaultValues()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetDefaultValues
  */

--- a/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetDescription.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetDescription.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.jfr.Label;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test descriptive annotations for EventType
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetDescription
  */

--- a/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetEventType.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetEventType.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,10 +29,11 @@
 import jdk.jfr.EventType;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test getEventType()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetEventType
  */

--- a/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetField.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetField.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,10 +30,11 @@
 import jdk.jfr.ValueDescriptor;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test getField()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetField
  */

--- a/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetFields.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetFields.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.jfr.ValueDescriptor;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test getFields()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetFields
  */

--- a/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetSettings.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/eventtype/TestGetSettings.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.jfr.SettingDescriptor;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test getSettings()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetSettings
  */

--- a/test/jdk/jdk/jfr/api/metadata/eventtype/TestUnloadingEventClass.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/eventtype/TestUnloadingEventClass.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,10 +38,11 @@
 import jdk.jfr.internal.JVM;
 import jdk.test.lib.Utils;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test that verifies event metadata is removed when an event class is unloaded.
+ * @requires vm.hasJFR
  *
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal

--- a/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestDefaultValue.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestDefaultValue.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,10 +29,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test SettingDescriptor.getName()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestDefaultValue
  */

--- a/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotation.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotation.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test SettingDescriptor.getAnnotation();
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetAnnotation
  */

--- a/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotationElement.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotationElement.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test SettingDescriptor.getAnnotationElements()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetAnnotationElement
  */

--- a/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetContentType.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetContentType.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,10 +34,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test SettingDescriptor.getContentType()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetDescription
  */

--- a/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetDescription.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetDescription.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test SettingDescriptor.getDescription()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetDescription
  */

--- a/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetLabel.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetLabel.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test SettingDescriptor.getLabel()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetLabel
  */

--- a/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetName.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetName.java	Fri Jul 20 09:46:57 2018 +0200
@@ -28,10 +28,11 @@
 import jdk.jfr.SettingDescriptor;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test SettingDescriptor.getName()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetName
  */

--- a/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeId.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeId.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,10 +29,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test SettingDescriptor.getTypeId()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetTypeId
  */

--- a/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeName.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeName.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,10 +29,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test SettingDescriptor.getTypeName();
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetTypeName
  */

--- a/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestClasses.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestClasses.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.test.lib.jfr.CommonHelper;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @summary Test ValueDescriptor.getAnnotations()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestClasses
  */

--- a/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestConstructor.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestConstructor.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.jfr.ValueDescriptor;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test ValueDescriptor.getAnnotations()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestConstructor
  */

--- a/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestGetAnnotations.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestGetAnnotations.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.jfr.ValueDescriptor;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test ValueDescriptor.getAnnotations()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestGetAnnotations
  */

--- a/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestGetFields.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestGetFields.java	Fri Jul 20 09:46:57 2018 +0200
@@ -28,10 +28,11 @@
 import jdk.jfr.ValueDescriptor;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test ValueDescriptor.getAnnotations()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestGetFields
  */

--- a/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestIsArray.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestIsArray.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,10 +30,11 @@
 import jdk.jfr.ValueDescriptor;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test ValueDescriptor.isArray().
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestIsArray
  */

--- a/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestSimpleTypes.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestSimpleTypes.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,10 +38,11 @@
 import jdk.jfr.ValueDescriptor;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test all basic types in ValueDescriptor.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestSimpleTypes
  */

--- a/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestValueDescriptorContentType.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestValueDescriptorContentType.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.jfr.ValueDescriptor;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Test ValueDescriptor.getContentType()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestValueDescriptorContentType
  */

--- a/test/jdk/jdk/jfr/api/recorder/TestRecorderInitialized.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recorder/TestRecorderInitialized.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,9 +29,10 @@
 import jdk.jfr.FlightRecorderListener;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test TestRecorderListener
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  *
  * @run main/othervm jdk.jfr.api.recorder.TestRecorderInitialized

--- a/test/jdk/jdk/jfr/api/recorder/TestRecorderListener.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recorder/TestRecorderListener.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.jfr.Recording;
 import jdk.jfr.RecordingState;
 
-/*
+/**
  * @test TestRecorderListener
  *
  * @key jfr
+ * @requires vm.hasJFR
  * @run main/othervm jdk.jfr.api.recorder.TestRecorderListener
  */
 public class TestRecorderListener {

--- a/test/jdk/jdk/jfr/api/recorder/TestStartStopRecording.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recorder/TestStartStopRecording.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,10 +34,11 @@
 import jdk.jfr.Recording;
 import jdk.test.lib.Utils;
 
-/*
+/**
  * @test TestStartStopRecording
  *
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recorder.TestStartStopRecording
  */

--- a/test/jdk/jdk/jfr/api/recording/destination/TestDestFileExist.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/destination/TestDestFileExist.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,10 +38,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @summary Set destination to an existing file. File should be overwritten.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestFileExist
  */