changeset 51897:67736b4846a0

8207830: [aix] disable jfr in build and tests Reviewed-by: kvn, erikj
author goetz
date Fri, 20 Jul 2018 09:46:57 +0200
parents 24c4780f69a5
children 936823fcf202
files make/autoconf/hotspot.m4 src/hotspot/share/prims/whitebox.cpp test/hotspot/jtreg/TEST.ROOT test/hotspot/jtreg/runtime/appcds/CDSandJFR.java test/hotspot/jtreg/runtime/appcds/TestWithProfiler.java test/hotspot/jtreg/runtime/appcds/sharedStrings/FlagCombo.java test/jdk/TEST.ROOT test/jdk/jdk/jfr/api/consumer/TestFieldAccess.java test/jdk/jdk/jfr/api/consumer/TestGetStackTrace.java test/jdk/jdk/jfr/api/consumer/TestHiddenMethod.java test/jdk/jdk/jfr/api/consumer/TestMethodGetModifiers.java test/jdk/jdk/jfr/api/consumer/TestReadTwice.java test/jdk/jdk/jfr/api/consumer/TestRecordedClassLoader.java test/jdk/jdk/jfr/api/consumer/TestRecordedEvent.java test/jdk/jdk/jfr/api/consumer/TestRecordedEventGetThread.java test/jdk/jdk/jfr/api/consumer/TestRecordedEventGetThreadOther.java test/jdk/jdk/jfr/api/consumer/TestRecordedFrame.java test/jdk/jdk/jfr/api/consumer/TestRecordedFullStackTrace.java test/jdk/jdk/jfr/api/consumer/TestRecordedInstantEventTimestamp.java test/jdk/jdk/jfr/api/consumer/TestRecordedMethodDescriptor.java test/jdk/jdk/jfr/api/consumer/TestRecordedObject.java test/jdk/jdk/jfr/api/consumer/TestRecordedThreadGroupParent.java test/jdk/jdk/jfr/api/consumer/TestRecordingFile.java test/jdk/jdk/jfr/api/consumer/TestRecordingFileReadEventEof.java test/jdk/jdk/jfr/api/consumer/TestRecordingInternals.java test/jdk/jdk/jfr/api/consumer/TestSingleRecordedEvent.java test/jdk/jdk/jfr/api/consumer/TestToString.java test/jdk/jdk/jfr/api/consumer/TestValueDescriptorRecorded.java test/jdk/jdk/jfr/api/event/TestAbstractEvent.java test/jdk/jdk/jfr/api/event/TestBeginEnd.java test/jdk/jdk/jfr/api/event/TestClinitRegistration.java test/jdk/jdk/jfr/api/event/TestClonedEvent.java test/jdk/jdk/jfr/api/event/TestEnableDisable.java test/jdk/jdk/jfr/api/event/TestEventFactory.java test/jdk/jdk/jfr/api/event/TestEventFactoryRegisterTwice.java test/jdk/jdk/jfr/api/event/TestEventFactoryRegistration.java test/jdk/jdk/jfr/api/event/TestExtends.java test/jdk/jdk/jfr/api/event/TestGetDuration.java test/jdk/jdk/jfr/api/event/TestIsEnabled.java test/jdk/jdk/jfr/api/event/TestIsEnabledMultiple.java test/jdk/jdk/jfr/api/event/TestOwnCommit.java test/jdk/jdk/jfr/api/event/TestShouldCommit.java test/jdk/jdk/jfr/api/event/TestStaticEnable.java test/jdk/jdk/jfr/api/event/dynamic/TestDynamicAnnotations.java test/jdk/jdk/jfr/api/event/dynamic/TestEventFactory.java test/jdk/jdk/jfr/api/flightrecorder/TestAddListenerTwice.java test/jdk/jdk/jfr/api/flightrecorder/TestAddPeriodicEvent.java test/jdk/jdk/jfr/api/flightrecorder/TestFlightRecorderListenerRecorderInitialized.java test/jdk/jdk/jfr/api/flightrecorder/TestGetEventTypes.java test/jdk/jdk/jfr/api/flightrecorder/TestGetPlatformRecorder.java test/jdk/jdk/jfr/api/flightrecorder/TestGetRecordings.java test/jdk/jdk/jfr/api/flightrecorder/TestGetSettings.java test/jdk/jdk/jfr/api/flightrecorder/TestIsAvailable.java test/jdk/jdk/jfr/api/flightrecorder/TestIsInitialized.java test/jdk/jdk/jfr/api/flightrecorder/TestListener.java test/jdk/jdk/jfr/api/flightrecorder/TestListenerNull.java test/jdk/jdk/jfr/api/flightrecorder/TestPeriodicEventsSameHook.java test/jdk/jdk/jfr/api/flightrecorder/TestRecorderInitializationCallback.java test/jdk/jdk/jfr/api/flightrecorder/TestRegisterUnregisterEvent.java test/jdk/jdk/jfr/api/flightrecorder/TestSettingsControl.java test/jdk/jdk/jfr/api/flightrecorder/TestSnapshot.java test/jdk/jdk/jfr/api/metadata/annotations/TestCategory.java test/jdk/jdk/jfr/api/metadata/annotations/TestContentType.java test/jdk/jdk/jfr/api/metadata/annotations/TestDescription.java test/jdk/jdk/jfr/api/metadata/annotations/TestDynamicAnnotation.java test/jdk/jdk/jfr/api/metadata/annotations/TestEnabled.java test/jdk/jdk/jfr/api/metadata/annotations/TestExperimental.java test/jdk/jdk/jfr/api/metadata/annotations/TestFieldAnnotations.java test/jdk/jdk/jfr/api/metadata/annotations/TestHasValue.java test/jdk/jdk/jfr/api/metadata/annotations/TestInheritedAnnotations.java test/jdk/jdk/jfr/api/metadata/annotations/TestLabel.java test/jdk/jdk/jfr/api/metadata/annotations/TestMetadata.java test/jdk/jdk/jfr/api/metadata/annotations/TestName.java test/jdk/jdk/jfr/api/metadata/annotations/TestPeriod.java test/jdk/jdk/jfr/api/metadata/annotations/TestRegistered.java test/jdk/jdk/jfr/api/metadata/annotations/TestRegisteredFalseAndRunning.java test/jdk/jdk/jfr/api/metadata/annotations/TestRelational.java test/jdk/jdk/jfr/api/metadata/annotations/TestSimpleMetadataEvent.java test/jdk/jdk/jfr/api/metadata/annotations/TestStackTrace.java test/jdk/jdk/jfr/api/metadata/annotations/TestThreshold.java test/jdk/jdk/jfr/api/metadata/annotations/TestTypesIdentical.java test/jdk/jdk/jfr/api/metadata/eventtype/TestGetAnnotation.java test/jdk/jdk/jfr/api/metadata/eventtype/TestGetAnnotationElements.java test/jdk/jdk/jfr/api/metadata/eventtype/TestGetAnnotations.java test/jdk/jdk/jfr/api/metadata/eventtype/TestGetCategory.java test/jdk/jdk/jfr/api/metadata/eventtype/TestGetDefaultValues.java test/jdk/jdk/jfr/api/metadata/eventtype/TestGetDescription.java test/jdk/jdk/jfr/api/metadata/eventtype/TestGetEventType.java test/jdk/jdk/jfr/api/metadata/eventtype/TestGetField.java test/jdk/jdk/jfr/api/metadata/eventtype/TestGetFields.java test/jdk/jdk/jfr/api/metadata/eventtype/TestGetSettings.java test/jdk/jdk/jfr/api/metadata/eventtype/TestUnloadingEventClass.java test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestDefaultValue.java test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotation.java test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotationElement.java test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetContentType.java test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetDescription.java test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetLabel.java test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetName.java test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeId.java test/jdk/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeName.java test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestClasses.java test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestConstructor.java test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestGetAnnotations.java test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestGetFields.java test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestIsArray.java test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestSimpleTypes.java test/jdk/jdk/jfr/api/metadata/valuedescriptor/TestValueDescriptorContentType.java test/jdk/jdk/jfr/api/recorder/TestRecorderInitialized.java test/jdk/jdk/jfr/api/recorder/TestRecorderListener.java test/jdk/jdk/jfr/api/recorder/TestStartStopRecording.java test/jdk/jdk/jfr/api/recording/destination/TestDestFileExist.java test/jdk/jdk/jfr/api/recording/destination/TestDestFileReadOnly.java test/jdk/jdk/jfr/api/recording/destination/TestDestInvalid.java test/jdk/jdk/jfr/api/recording/destination/TestDestLongPath.java test/jdk/jdk/jfr/api/recording/destination/TestDestMultiple.java test/jdk/jdk/jfr/api/recording/destination/TestDestReadOnly.java test/jdk/jdk/jfr/api/recording/destination/TestDestState.java test/jdk/jdk/jfr/api/recording/destination/TestDestToDiskFalse.java test/jdk/jdk/jfr/api/recording/destination/TestDestToDiskTrue.java test/jdk/jdk/jfr/api/recording/destination/TestDestWithDuration.java test/jdk/jdk/jfr/api/recording/dump/TestDump.java test/jdk/jdk/jfr/api/recording/dump/TestDumpInvalid.java test/jdk/jdk/jfr/api/recording/dump/TestDumpLongPath.java test/jdk/jdk/jfr/api/recording/dump/TestDumpMultiple.java test/jdk/jdk/jfr/api/recording/dump/TestDumpReadOnly.java test/jdk/jdk/jfr/api/recording/dump/TestDumpState.java test/jdk/jdk/jfr/api/recording/event/TestChunkPeriod.java test/jdk/jdk/jfr/api/recording/event/TestEnableClass.java test/jdk/jdk/jfr/api/recording/event/TestEnableName.java test/jdk/jdk/jfr/api/recording/event/TestEventTime.java test/jdk/jdk/jfr/api/recording/event/TestLoadEventAfterStart.java test/jdk/jdk/jfr/api/recording/event/TestPeriod.java test/jdk/jdk/jfr/api/recording/event/TestReEnableClass.java test/jdk/jdk/jfr/api/recording/event/TestReEnableMultiple.java test/jdk/jdk/jfr/api/recording/event/TestReEnableName.java test/jdk/jdk/jfr/api/recording/event/TestRecordingEnableDisable.java test/jdk/jdk/jfr/api/recording/event/TestThreshold.java test/jdk/jdk/jfr/api/recording/misc/TestGetId.java test/jdk/jdk/jfr/api/recording/misc/TestGetSize.java test/jdk/jdk/jfr/api/recording/misc/TestGetSizeToMem.java test/jdk/jdk/jfr/api/recording/misc/TestGetStream.java test/jdk/jdk/jfr/api/recording/misc/TestRecordingBase.java test/jdk/jdk/jfr/api/recording/misc/TestRecordingCopy.java test/jdk/jdk/jfr/api/recording/options/TestDuration.java test/jdk/jdk/jfr/api/recording/options/TestName.java test/jdk/jdk/jfr/api/recording/settings/TestConfigurationGetContents.java test/jdk/jdk/jfr/api/recording/settings/TestCreateConfigFromPath.java test/jdk/jdk/jfr/api/recording/settings/TestCreateConfigFromReader.java test/jdk/jdk/jfr/api/recording/settings/TestGetConfigurations.java test/jdk/jdk/jfr/api/recording/settings/TestSettingsAvailability.java test/jdk/jdk/jfr/api/recording/state/TestOptionState.java test/jdk/jdk/jfr/api/recording/state/TestState.java test/jdk/jdk/jfr/api/recording/state/TestStateDuration.java test/jdk/jdk/jfr/api/recording/state/TestStateIdenticalListeners.java test/jdk/jdk/jfr/api/recording/state/TestStateInvalid.java test/jdk/jdk/jfr/api/recording/state/TestStateMultiple.java test/jdk/jdk/jfr/api/recording/state/TestStateScheduleStart.java test/jdk/jdk/jfr/api/recording/time/TestTime.java test/jdk/jdk/jfr/api/recording/time/TestTimeDuration.java test/jdk/jdk/jfr/api/recording/time/TestTimeMultiple.java test/jdk/jdk/jfr/api/recording/time/TestTimeScheduleStart.java test/jdk/jdk/jfr/api/settings/TestFilterEvents.java test/jdk/jdk/jfr/cmd/TestHelp.java test/jdk/jdk/jfr/cmd/TestPrint.java test/jdk/jdk/jfr/cmd/TestPrintDefault.java test/jdk/jdk/jfr/cmd/TestPrintJSON.java test/jdk/jdk/jfr/cmd/TestPrintXML.java test/jdk/jdk/jfr/cmd/TestReconstruct.java test/jdk/jdk/jfr/cmd/TestSplit.java test/jdk/jdk/jfr/cmd/TestSummary.java test/jdk/jdk/jfr/event/compiler/TestAllocInNewTLAB.java test/jdk/jdk/jfr/event/compiler/TestAllocOutsideTLAB.java test/jdk/jdk/jfr/event/compiler/TestCodeCacheConfig.java test/jdk/jdk/jfr/event/compiler/TestCodeCacheFull.java test/jdk/jdk/jfr/event/compiler/TestCodeCacheStats.java test/jdk/jdk/jfr/event/compiler/TestCodeSweeper.java test/jdk/jdk/jfr/event/compiler/TestCodeSweeperConfig.java test/jdk/jdk/jfr/event/compiler/TestCodeSweeperStats.java test/jdk/jdk/jfr/event/compiler/TestCompilerCompile.java test/jdk/jdk/jfr/event/compiler/TestCompilerConfig.java test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java test/jdk/jdk/jfr/event/compiler/TestCompilerPhase.java test/jdk/jdk/jfr/event/compiler/TestCompilerStats.java test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSConcurrent.java test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSMarkSweep.java test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1ConcurrentMark.java test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1FullCollection.java test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithPSMarkSweep.java test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithSerial.java test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSConcurrent.java test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSMarkSweep.java test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1ConcurrentMark.java test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1FullCollection.java test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithPSMarkSweep.java test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithParNew.java test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithParallelOld.java test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithSerial.java test/jdk/jdk/jfr/event/gc/collection/TestGCGarbageCollectionEvent.java test/jdk/jdk/jfr/event/gc/collection/TestGCWithFasttime.java test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithDefNew.java test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithG1New.java test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParNew.java test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParallelScavenge.java test/jdk/jdk/jfr/event/gc/configuration/TestGCConfigurationEvent.java test/jdk/jdk/jfr/event/gc/configuration/TestGCConfigurationEventWithDefaultPauseTarget.java test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWith32BitOops.sh test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithHeapBasedOops.sh test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithZeroBasedOops.sh test/jdk/jdk/jfr/event/gc/configuration/TestGCSurvivorConfigurationEvent.java test/jdk/jdk/jfr/event/gc/configuration/TestGCTLABConfigurationEvent.java test/jdk/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithMinAndMaxSize.java test/jdk/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithNewRatio.java test/jdk/jdk/jfr/event/gc/detailed/TestCMSConcurrentModeFailureEvent.java test/jdk/jdk/jfr/event/gc/detailed/TestEvacuationFailedEvent.java test/jdk/jdk/jfr/event/gc/detailed/TestEvacuationInfoEvent.java test/jdk/jdk/jfr/event/gc/detailed/TestG1AIHOPEvent.java test/jdk/jdk/jfr/event/gc/detailed/TestG1ConcurrentModeFailureEvent.java test/jdk/jdk/jfr/event/gc/detailed/TestG1EvacMemoryStatsEvent.java test/jdk/jdk/jfr/event/gc/detailed/TestG1HeapRegionTypeChangeEvent.java test/jdk/jdk/jfr/event/gc/detailed/TestG1IHOPEvent.java test/jdk/jdk/jfr/event/gc/detailed/TestG1MMUEvent.java test/jdk/jdk/jfr/event/gc/detailed/TestPromotionEventWithG1.java test/jdk/jdk/jfr/event/gc/detailed/TestPromotionEventWithParallelScavenge.java test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithDefNew.java test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParNew.java test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParallelScavenge.java test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithCMS.java test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithDefNew.java test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithG1.java test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParNew.java test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParallel.java test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithCMS.java test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithDefNew.java test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithG1.java test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParNew.java test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParallel.java test/jdk/jdk/jfr/event/gc/detailed/TestTenuringDistributionEvent.java test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryCommittedSize.java test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventConcurrentCMS.java test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventDefNewSerial.java test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventG1.java test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSParOld.java test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSSerial.java test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventParNewCMS.java test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSConcurrent.java test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSMarkSweep.java test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1ConcurrentMark.java test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1FullCollection.java test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithPSMarkSweep.java test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithParallelOld.java test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithSerial.java test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountEvent.java test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSConcurrent.java test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSMarkSweep.java test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithDefNew.java test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1ConcurrentMark.java test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1FullCollection.java test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1New.java test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithPSMarkSweep.java test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelOld.java test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelScavenge.java test/jdk/jdk/jfr/event/gc/stacktrace/TestConcMarkSweepAllocationPendingStackTrace.java test/jdk/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java test/jdk/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java test/jdk/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java test/jdk/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java test/jdk/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace.java test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java test/jdk/jdk/jfr/event/gc/stacktrace/TestParNewAllocationPendingStackTrace.java test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java test/jdk/jdk/jfr/event/io/EvilInstrument.java test/jdk/jdk/jfr/event/io/TestDisabledEvents.java test/jdk/jdk/jfr/event/io/TestFileChannelEvents.java test/jdk/jdk/jfr/event/io/TestFileReadOnly.java test/jdk/jdk/jfr/event/io/TestFileStreamEvents.java test/jdk/jdk/jfr/event/io/TestInstrumentation.java test/jdk/jdk/jfr/event/io/TestRandomAccessFileEvents.java test/jdk/jdk/jfr/event/io/TestRandomAccessFileThread.java test/jdk/jdk/jfr/event/io/TestSocketChannelEvents.java test/jdk/jdk/jfr/event/io/TestSocketEvents.java test/jdk/jdk/jfr/event/metadata/TestDefaultConfigurations.java test/jdk/jdk/jfr/event/metadata/TestEventMetadata.java test/jdk/jdk/jfr/event/oldobject/TestAllocationTime.java test/jdk/jdk/jfr/event/oldobject/TestArrayInformation.java test/jdk/jdk/jfr/event/oldobject/TestCMS.java test/jdk/jdk/jfr/event/oldobject/TestCircularReference.java test/jdk/jdk/jfr/event/oldobject/TestClassLoaderLeak.java test/jdk/jdk/jfr/event/oldobject/TestFieldInformation.java test/jdk/jdk/jfr/event/oldobject/TestG1.java test/jdk/jdk/jfr/event/oldobject/TestHeapDeep.java test/jdk/jdk/jfr/event/oldobject/TestHeapShallow.java test/jdk/jdk/jfr/event/oldobject/TestLargeRootSet.java test/jdk/jdk/jfr/event/oldobject/TestLastKnownHeapUsage.java test/jdk/jdk/jfr/event/oldobject/TestListenerLeak.java test/jdk/jdk/jfr/event/oldobject/TestMetadataRetention.java test/jdk/jdk/jfr/event/oldobject/TestObjectDescription.java test/jdk/jdk/jfr/event/oldobject/TestParallel.java test/jdk/jdk/jfr/event/oldobject/TestParallelOld.java test/jdk/jdk/jfr/event/oldobject/TestReferenceChainLimit.java test/jdk/jdk/jfr/event/oldobject/TestSanityDefault.java test/jdk/jdk/jfr/event/oldobject/TestSerial.java test/jdk/jdk/jfr/event/oldobject/TestThreadLocalLeak.java test/jdk/jdk/jfr/event/os/TestCPUInformation.java test/jdk/jdk/jfr/event/os/TestCPULoad.java test/jdk/jdk/jfr/event/os/TestCPUTimeStampCounter.java test/jdk/jdk/jfr/event/os/TestInitialEnvironmentVariable.sh test/jdk/jdk/jfr/event/os/TestOSInfo.java test/jdk/jdk/jfr/event/os/TestPhysicalMemoryEvent.java test/jdk/jdk/jfr/event/os/TestSystemProcess.java test/jdk/jdk/jfr/event/os/TestThreadContextSwitches.java test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java test/jdk/jdk/jfr/event/runtime/TestActiveRecordingEvent.java test/jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java test/jdk/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java test/jdk/jdk/jfr/event/runtime/TestClassDefineEvent.java test/jdk/jdk/jfr/event/runtime/TestClassLoadEvent.java test/jdk/jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java test/jdk/jdk/jfr/event/runtime/TestClassLoadingStatisticsEvent.java test/jdk/jdk/jfr/event/runtime/TestClassUnloadEvent.java test/jdk/jdk/jfr/event/runtime/TestExceptionEvents.java test/jdk/jdk/jfr/event/runtime/TestExceptionSubclass.java test/jdk/jdk/jfr/event/runtime/TestJavaBlockedEvent.java test/jdk/jdk/jfr/event/runtime/TestJavaMonitorInflateEvent.java test/jdk/jdk/jfr/event/runtime/TestJavaMonitorWaitEvent.java test/jdk/jdk/jfr/event/runtime/TestJavaMonitorWaitTimeOut.java test/jdk/jdk/jfr/event/runtime/TestJavaThreadStatisticsEvent.java test/jdk/jdk/jfr/event/runtime/TestJavaThreadStatisticsEventBean.java test/jdk/jdk/jfr/event/runtime/TestModuleEvents.java test/jdk/jdk/jfr/event/runtime/TestNativeLibrariesEvent.java test/jdk/jdk/jfr/event/runtime/TestNetworkUtilizationEvent.java test/jdk/jdk/jfr/event/runtime/TestSafepointEvents.java test/jdk/jdk/jfr/event/runtime/TestSizeTFlags.java test/jdk/jdk/jfr/event/runtime/TestSystemPropertyEvent.java test/jdk/jdk/jfr/event/runtime/TestThreadAllocationEvent.java test/jdk/jdk/jfr/event/runtime/TestThreadCpuTimeEvent.java test/jdk/jdk/jfr/event/runtime/TestThreadDumpEvent.java test/jdk/jdk/jfr/event/runtime/TestThreadParkEvent.java test/jdk/jdk/jfr/event/runtime/TestThreadSleepEvent.java test/jdk/jdk/jfr/event/runtime/TestThreadStartEndEvents.java test/jdk/jdk/jfr/event/runtime/TestThrowableInstrumentation.java test/jdk/jdk/jfr/event/runtime/TestVMInfoEvent.sh test/jdk/jdk/jfr/event/runtime/TestVMOperation.java test/jdk/jdk/jfr/event/runtime/TestVmFlagChangedEvent.java test/jdk/jdk/jfr/event/sampling/TestNative.java test/jdk/jdk/jfr/jcmd/TestJcmdChangeLogLevel.java test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java test/jdk/jdk/jfr/jcmd/TestJcmdDump.java test/jdk/jdk/jfr/jcmd/TestJcmdDumpGeneratedFilename.java test/jdk/jdk/jfr/jcmd/TestJcmdDumpLimited.java test/jdk/jdk/jfr/jcmd/TestJcmdDumpPathToGCRoots.java test/jdk/jdk/jfr/jcmd/TestJcmdLegacy.java test/jdk/jdk/jfr/jcmd/TestJcmdSaveToFile.java test/jdk/jdk/jfr/jcmd/TestJcmdStartDirNotExist.java test/jdk/jdk/jfr/jcmd/TestJcmdStartInvaldFile.java test/jdk/jdk/jfr/jcmd/TestJcmdStartPathToGCRoots.java test/jdk/jdk/jfr/jcmd/TestJcmdStartReadOnlyFile.java test/jdk/jdk/jfr/jcmd/TestJcmdStartStopDefault.java test/jdk/jdk/jfr/jcmd/TestJcmdStartWithOptions.java test/jdk/jdk/jfr/jcmd/TestJcmdStartWithSettings.java test/jdk/jdk/jfr/jcmd/TestJcmdStopInvalidFile.java test/jdk/jdk/jfr/jcmd/TestJcmdStopReadOnlyFile.java test/jdk/jdk/jfr/jmx/TestClone.java test/jdk/jdk/jfr/jmx/TestCloneRepeat.java test/jdk/jdk/jfr/jmx/TestConfigurationInfo.java test/jdk/jdk/jfr/jmx/TestCopyTo.java test/jdk/jdk/jfr/jmx/TestCopyToInvalidPath.java test/jdk/jdk/jfr/jmx/TestCopyToReadOnlyDir.java test/jdk/jdk/jfr/jmx/TestCopyToRunning.java test/jdk/jdk/jfr/jmx/TestEventTypes.java test/jdk/jdk/jfr/jmx/TestGetRecordings.java test/jdk/jdk/jfr/jmx/TestGetRecordingsMultiple.java test/jdk/jdk/jfr/jmx/TestMultipleRecordings.java test/jdk/jdk/jfr/jmx/TestNotificationListener.java test/jdk/jdk/jfr/jmx/TestPredefinedConfiguration.java test/jdk/jdk/jfr/jmx/TestPredefinedConfigurationInvalid.java test/jdk/jdk/jfr/jmx/TestRecordingOptions.java test/jdk/jdk/jfr/jmx/TestRecordingSettings.java test/jdk/jdk/jfr/jmx/TestRecordingSettingsInvalid.java test/jdk/jdk/jfr/jmx/TestRecordingSettingsMultiple.java test/jdk/jdk/jfr/jmx/TestRecordingState.java test/jdk/jdk/jfr/jmx/TestRecordingStateInvalid.java test/jdk/jdk/jfr/jmx/TestSetConfiguration.java test/jdk/jdk/jfr/jmx/TestSetConfigurationInvalid.java test/jdk/jdk/jfr/jmx/TestSnapshot.java test/jdk/jdk/jfr/jmx/TestStartRecording.java test/jdk/jdk/jfr/jmx/TestStream.java test/jdk/jdk/jfr/jmx/TestStreamClosed.java test/jdk/jdk/jfr/jmx/TestStreamMultiple.java test/jdk/jdk/jfr/jmx/TestWrongId.java test/jdk/jdk/jfr/jmx/info/TestConfigurationInfo.java test/jdk/jdk/jfr/jmx/info/TestEventTypeInfo.java test/jdk/jdk/jfr/jmx/info/TestRecordingInfo.java test/jdk/jdk/jfr/jmx/info/TestSettingDescriptorInfo.java test/jdk/jdk/jfr/jmx/security/TestEnoughPermission.java test/jdk/jdk/jfr/jmx/security/TestNoControlPermission.java test/jdk/jdk/jfr/jmx/security/TestNoMonitorPermission.java test/jdk/jdk/jfr/jmx/security/TestNotificationListenerPermission.java test/jdk/jdk/jfr/jvm/TestBeginAndEnd.java test/jdk/jdk/jfr/jvm/TestClassId.java test/jdk/jdk/jfr/jvm/TestCounterTime.java test/jdk/jdk/jfr/jvm/TestCreateNative.java test/jdk/jdk/jfr/jvm/TestDumpOnCrash.java test/jdk/jdk/jfr/jvm/TestGetAllEventClasses.java test/jdk/jdk/jfr/jvm/TestGetEventWriter.java test/jdk/jdk/jfr/jvm/TestGetStackTraceId.java test/jdk/jdk/jfr/jvm/TestJFRIntrinsic.java test/jdk/jdk/jfr/jvm/TestJavaEvent.java test/jdk/jdk/jfr/jvm/TestJfrJavaBase.java test/jdk/jdk/jfr/jvm/TestLargeJavaEvent512k.java test/jdk/jdk/jfr/jvm/TestLargeJavaEvent64k.java test/jdk/jdk/jfr/jvm/TestLogImplementation.java test/jdk/jdk/jfr/jvm/TestLogOutput.java test/jdk/jdk/jfr/jvm/TestPid.java test/jdk/jdk/jfr/jvm/TestUnloadEventClassCount.java test/jdk/jdk/jfr/jvm/TestUnsupportedVM.java test/jdk/jdk/jfr/startupargs/TestBadOptionValues.java test/jdk/jdk/jfr/startupargs/TestDumpOnExit.java test/jdk/jdk/jfr/startupargs/TestMemoryOptions.java test/jdk/jdk/jfr/startupargs/TestMultipleStartupRecordings.java test/jdk/jdk/jfr/startupargs/TestOldObjectQueueSize.java test/jdk/jdk/jfr/startupargs/TestRepositoryPath.java test/jdk/jdk/jfr/startupargs/TestRepositoryPathLong.java test/jdk/jdk/jfr/startupargs/TestRetransform.java test/jdk/jdk/jfr/startupargs/TestRetransformUsingLog.java test/jdk/jdk/jfr/startupargs/TestStartDelay.java test/jdk/jdk/jfr/startupargs/TestStartDelayRunning.java test/jdk/jdk/jfr/startupargs/TestStartDuration.java test/jdk/jdk/jfr/startupargs/TestStartMaxAgeSize.java test/jdk/jdk/jfr/startupargs/TestStartName.java test/jdk/jdk/jfr/startupargs/TestStartRecording.java test/jtreg-ext/requires/VMProps.java test/lib/sun/hotspot/WhiteBox.java
diffstat 438 files changed, 904 insertions(+), 431 deletions(-) [+]
line wrap: on
line diff
--- 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
  */
--- a/test/jdk/jdk/jfr/api/recording/destination/TestDestFileReadOnly.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/destination/TestDestFileReadOnly.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.FileHelper;
 
-/*
+/**
  * @test
  * @summary Set destination to a read-only file. Expects exception.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestFileReadOnly
  */
--- a/test/jdk/jdk/jfr/api/recording/destination/TestDestInvalid.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/destination/TestDestInvalid.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,10 +39,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @summary Test setDestination to invalid paths
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestInvalid
  */
--- a/test/jdk/jdk/jfr/api/recording/destination/TestDestLongPath.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/destination/TestDestLongPath.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.FileHelper;
 
-/*
+/**
  * @test
  * @summary Set destination to a long path
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestLongPath
  */
--- a/test/jdk/jdk/jfr/api/recording/destination/TestDestMultiple.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/destination/TestDestMultiple.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @summary Test setDestination with concurrent recordings
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm -Xlog:jfr=trace jdk.jfr.api.recording.destination.TestDestMultiple
  */
--- a/test/jdk/jdk/jfr/api/recording/destination/TestDestReadOnly.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/destination/TestDestReadOnly.java	Fri Jul 20 09:46:57 2018 +0200
@@ -40,10 +40,11 @@
 import jdk.test.lib.jfr.FileHelper;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @summary Test setDestination to read-only dir
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestReadOnly
  */
--- a/test/jdk/jdk/jfr/api/recording/destination/TestDestState.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/destination/TestDestState.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @summary Call setDestination() when recording in different states
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestState
  */
--- a/test/jdk/jdk/jfr/api/recording/destination/TestDestToDiskFalse.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/destination/TestDestToDiskFalse.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,10 +39,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @summary Basic test for setDestination with disk=false
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestToDiskFalse
  */
--- a/test/jdk/jdk/jfr/api/recording/destination/TestDestToDiskTrue.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/destination/TestDestToDiskTrue.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 Basic test for setDestination with disk=true
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestToDiskTrue
  */
--- a/test/jdk/jdk/jfr/api/recording/destination/TestDestWithDuration.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/destination/TestDestWithDuration.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,10 +39,11 @@
 import jdk.test.lib.jfr.CommonHelper;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @summary Test that recording is auto closed after duration
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestWithDuration
  */
--- a/test/jdk/jdk/jfr/api/recording/dump/TestDump.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/dump/TestDump.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,10 +34,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @summary Test copyTo and parse file
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.dump.TestDump
  */
--- a/test/jdk/jdk/jfr/api/recording/dump/TestDumpInvalid.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/dump/TestDumpInvalid.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @summary Test copyTo and parse file
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.dump.TestDumpInvalid
  */
--- a/test/jdk/jdk/jfr/api/recording/dump/TestDumpLongPath.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/dump/TestDumpLongPath.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.FileHelper;
 
-/*
+/**
  * @test
  * @summary Test copyTo and parse file
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.dump.TestDumpLongPath
  */
--- a/test/jdk/jdk/jfr/api/recording/dump/TestDumpMultiple.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/dump/TestDumpMultiple.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @summary Test copyTo and parse file
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.dump.TestDumpMultiple
  */
--- a/test/jdk/jdk/jfr/api/recording/dump/TestDumpReadOnly.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/dump/TestDumpReadOnly.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,10 +35,11 @@
 import jdk.test.lib.jfr.FileHelper;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @summary Test copyTo and parse file
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.dump.TestDumpReadOnly
  */
--- a/test/jdk/jdk/jfr/api/recording/dump/TestDumpState.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/dump/TestDumpState.java	Fri Jul 20 09:46:57 2018 +0200
@@ -42,10 +42,11 @@
 import jdk.test.lib.jfr.SimpleEventHelper;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @summary call copyTo() with recording in all states.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.dump.TestDumpState
  */
--- a/test/jdk/jdk/jfr/api/recording/event/TestChunkPeriod.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/event/TestChunkPeriod.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/*
+/**
  * @test
  * @summary Test periodic setting that involves chunks.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.event.TestChunkPeriod
  */
--- a/test/jdk/jdk/jfr/api/recording/event/TestEnableClass.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/event/TestEnableClass.java	Fri Jul 20 09:46:57 2018 +0200
@@ -28,10 +28,11 @@
 import jdk.jfr.Recording;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @summary Simple enable Event class.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.event.TestEnableClass
  */
--- a/test/jdk/jdk/jfr/api/recording/event/TestEnableName.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/event/TestEnableName.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,10 +35,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Simple enable Event class.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.event.TestEnableName
  */
--- a/test/jdk/jdk/jfr/api/recording/event/TestEventTime.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/event/TestEventTime.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,10 +38,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test getStartTime() and getEndTime(). Verify startTime <= endTime
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.event.TestEventTime
  */
--- a/test/jdk/jdk/jfr/api/recording/event/TestLoadEventAfterStart.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/event/TestLoadEventAfterStart.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 Load event class after recording started.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @build jdk.test.lib.jfr.SimpleEvent
  * @run main/othervm jdk.jfr.api.recording.event.TestLoadEventAfterStart
--- a/test/jdk/jdk/jfr/api/recording/event/TestPeriod.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/event/TestPeriod.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test event period.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.event.TestPeriod
  */
--- a/test/jdk/jdk/jfr/api/recording/event/TestReEnableClass.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/event/TestReEnableClass.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.jfr.Recording;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @summary Enable, disable, enable event during recording.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.event.TestReEnableClass
  */
--- a/test/jdk/jdk/jfr/api/recording/event/TestReEnableMultiple.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/event/TestReEnableMultiple.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,10 +39,11 @@
 import jdk.test.lib.jfr.SimpleEvent;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @summary Enable, disable, enable event during recording.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.event.TestReEnableMultiple
  */
--- a/test/jdk/jdk/jfr/api/recording/event/TestReEnableName.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/event/TestReEnableName.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,10 +35,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Enable/disable event by name during recording.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.event.TestReEnableName
  */
--- a/test/jdk/jdk/jfr/api/recording/event/TestRecordingEnableDisable.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/event/TestRecordingEnableDisable.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.test.lib.jfr.SimpleEvent;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @summary Enable, disable, enable event during recording.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.event.TestRecordingEnableDisable
  */
--- a/test/jdk/jdk/jfr/api/recording/event/TestThreshold.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/event/TestThreshold.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 event threshold.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.event.TestThreshold
  */
--- a/test/jdk/jdk/jfr/api/recording/misc/TestGetId.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/misc/TestGetId.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.jfr.Recording;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Verify that each recording get unique a id
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm  jdk.jfr.api.recording.misc.TestGetId
  */
--- a/test/jdk/jdk/jfr/api/recording/misc/TestGetSize.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/misc/TestGetSize.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,10 +35,11 @@
 import jdk.jfr.Recording;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @summary Test recording file size with Recording.getSize()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.misc.TestGetSize
  */
--- a/test/jdk/jdk/jfr/api/recording/misc/TestGetSizeToMem.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/misc/TestGetSizeToMem.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @summary Test recording file size with Recording.getSize()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.misc.TestGetSizeToMem
  */
--- a/test/jdk/jdk/jfr/api/recording/misc/TestGetStream.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/misc/TestGetStream.java	Fri Jul 20 09:46:57 2018 +0200
@@ -43,10 +43,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/*
+/**
  * @test
  * @summary A simple test for Recording.getStream()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.misc.TestGetStream
  */
--- a/test/jdk/jdk/jfr/api/recording/misc/TestRecordingBase.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/misc/TestRecordingBase.java	Fri Jul 20 09:46:57 2018 +0200
@@ -40,10 +40,11 @@
 import jdk.jfr.Recording;
 import jdk.jfr.RecordingState;
 
-/*
+/**
  * @test
  * @summary Basic tests for Recording
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.misc.TestRecordingBase
  */
--- a/test/jdk/jdk/jfr/api/recording/misc/TestRecordingCopy.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/misc/TestRecordingCopy.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 
 import java.util.List;
 
-/*
+/**
  * @test
  * @summary A simple test for Recording.copy()
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.misc.TestRecordingCopy
  */
--- a/test/jdk/jdk/jfr/api/recording/options/TestDuration.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/options/TestDuration.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.CommonHelper;
 
-/*
+/**
  * @test
  * @summary Test setDuration(). Verify recording is stopped automatically.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.options.TestDuration
  */
--- a/test/jdk/jdk/jfr/api/recording/options/TestName.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/options/TestName.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,10 +30,11 @@
 import jdk.test.lib.jfr.CommonHelper;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @summary Test setName().
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.options.TestName
  */
--- a/test/jdk/jdk/jfr/api/recording/settings/TestConfigurationGetContents.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/settings/TestConfigurationGetContents.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,10 +32,11 @@
 import jdk.jfr.Configuration;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Verifies Configuration.getContents() for every configuration
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.settings.TestConfigurationGetContents
  */
--- a/test/jdk/jdk/jfr/api/recording/settings/TestCreateConfigFromPath.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/settings/TestCreateConfigFromPath.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,10 +35,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @summary Test setName().
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.settings.TestCreateConfigFromPath
  */
--- a/test/jdk/jdk/jfr/api/recording/settings/TestCreateConfigFromReader.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/settings/TestCreateConfigFromReader.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,10 +35,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @summary Test setName().
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.settings.TestCreateConfigFromReader
  */
--- a/test/jdk/jdk/jfr/api/recording/settings/TestGetConfigurations.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/settings/TestGetConfigurations.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,11 +29,12 @@
 import jdk.jfr.Configuration;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Verifies that there is the default config and that it has
  *          the expected parameters
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.settings.TestGetConfigurations
  */
--- a/test/jdk/jdk/jfr/api/recording/settings/TestSettingsAvailability.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/settings/TestSettingsAvailability.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,10 +39,11 @@
 import jdk.jfr.consumer.RecordingFile;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @summary Verifies that event types has the correct type of settings
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.settings.TestSettingsAvailability
  */
--- a/test/jdk/jdk/jfr/api/recording/state/TestOptionState.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/state/TestOptionState.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.jfr.Recording;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test options in different states
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.state.TestOptionState
  */
--- a/test/jdk/jdk/jfr/api/recording/state/TestState.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/state/TestState.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.jfr.RecordingState;
 import jdk.test.lib.jfr.CommonHelper;
 
-/*
+/**
  * @test
  * @summary Test Recording state
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.state.TestState
  */
--- a/test/jdk/jdk/jfr/api/recording/state/TestStateDuration.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/state/TestStateDuration.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,10 +34,11 @@
 import jdk.test.lib.jfr.CommonHelper;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @summary Test Recording state
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.state.TestStateDuration
  */
--- a/test/jdk/jdk/jfr/api/recording/state/TestStateIdenticalListeners.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/state/TestStateIdenticalListeners.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.jfr.FlightRecorderListener;
 import jdk.jfr.Recording;
 
-/*
+/**
  * @test
  * @summary Test Recording state with concurrent recordings
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.state.TestStateIdenticalListeners
  */
--- a/test/jdk/jdk/jfr/api/recording/state/TestStateInvalid.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/state/TestStateInvalid.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,10 +30,11 @@
 import jdk.test.lib.jfr.CommonHelper;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @summary Test start/stop/close recording from different recording states.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.state.TestStateInvalid
  */
--- a/test/jdk/jdk/jfr/api/recording/state/TestStateMultiple.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/state/TestStateMultiple.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,10 +30,11 @@
 import jdk.test.lib.jfr.CommonHelper;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @summary Test Recording state with concurrent recordings
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.state.TestStateMultiple
  */
--- a/test/jdk/jdk/jfr/api/recording/state/TestStateScheduleStart.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/state/TestStateScheduleStart.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 Recording state
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.state.TestStateScheduleStart
  */
--- a/test/jdk/jdk/jfr/api/recording/time/TestTime.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/time/TestTime.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,10 +30,11 @@
 import jdk.jfr.Recording;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test Recording.get*Time()
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm  jdk.jfr.api.recording.time.TestTime
  */
--- a/test/jdk/jdk/jfr/api/recording/time/TestTimeDuration.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/time/TestTimeDuration.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.jfr.Recording;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test Recording.setDuration() and Recording.get*Time()
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.time.TestTimeDuration
  */
--- a/test/jdk/jdk/jfr/api/recording/time/TestTimeMultiple.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/time/TestTimeMultiple.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,10 +30,11 @@
 import jdk.jfr.Recording;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test recording times with concurrent recordings
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.time.TestTimeMultiple
  */
--- a/test/jdk/jdk/jfr/api/recording/time/TestTimeScheduleStart.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/recording/time/TestTimeScheduleStart.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.CommonHelper;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test Recording.scheduleStart() and Recording.get*Time()
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.api.recording.time.TestTimeScheduleStart
  */
--- a/test/jdk/jdk/jfr/api/settings/TestFilterEvents.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/api/settings/TestFilterEvents.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,10 +34,11 @@
 
 import static jdk.test.lib.Asserts.assertEquals;
 
-/*
+/**
  * @test
  * @summary The test uses SettingControl
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.api.settings.TestFilterEvents
  */
--- a/test/jdk/jdk/jfr/cmd/TestHelp.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/cmd/TestHelp.java	Fri Jul 20 09:46:57 2018 +0200
@@ -27,10 +27,11 @@
 
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary Test help
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.cmd.TestHelp
  */
--- a/test/jdk/jdk/jfr/cmd/TestPrint.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/cmd/TestPrint.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,10 +32,11 @@
 import jdk.test.lib.Utils;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary Test jfr print
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.cmd.TestPrint
  */
--- a/test/jdk/jdk/jfr/cmd/TestPrintDefault.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/cmd/TestPrintDefault.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,10 +29,11 @@
 
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Tests print --json
+ * @requires vm.hasJFR
  *
  * @library /test/lib /test/jdk
  * @modules java.scripting
--- a/test/jdk/jdk/jfr/cmd/TestPrintJSON.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/cmd/TestPrintJSON.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,10 +38,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Tests print --json
+ * @requires vm.hasJFR
  *
  * @library /test/lib /test/jdk
  * @modules jdk.scripting.nashorn
--- a/test/jdk/jdk/jfr/cmd/TestPrintXML.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/cmd/TestPrintXML.java	Fri Jul 20 09:46:57 2018 +0200
@@ -52,10 +52,11 @@
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Tests print --xml
+ * @requires vm.hasJFR
  *
  * @library /test/lib /test/jdk
  * @modules java.scripting
--- a/test/jdk/jdk/jfr/cmd/TestReconstruct.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/cmd/TestReconstruct.java	Fri Jul 20 09:46:57 2018 +0200
@@ -41,10 +41,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary Test jfr reconstruct
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal
  * @run main/othervm jdk.jfr.cmd.TestReconstruct
--- a/test/jdk/jdk/jfr/cmd/TestSplit.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/cmd/TestSplit.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,10 +38,11 @@
 import jdk.jfr.consumer.RecordingFile;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary Test jfr split
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.cmd.TestSplit
  */
--- a/test/jdk/jdk/jfr/cmd/TestSummary.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/cmd/TestSummary.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.jfr.consumer.RecordingFile;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary Test jfr info
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.cmd.TestSummary
  */
--- a/test/jdk/jdk/jfr/event/compiler/TestAllocInNewTLAB.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/compiler/TestAllocInNewTLAB.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test that event is triggered when an object is allocated in a new TLAB.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm -XX:+UseTLAB -XX:TLABSize=100k -XX:-ResizeTLAB -XX:TLABRefillWasteFraction=1 jdk.jfr.event.compiler.TestAllocInNewTLAB
  * @run main/othervm -XX:+UseTLAB -XX:TLABSize=100k -XX:-ResizeTLAB -XX:TLABRefillWasteFraction=1 -XX:-FastTLABRefill jdk.jfr.event.compiler.TestAllocInNewTLAB
--- a/test/jdk/jdk/jfr/event/compiler/TestAllocOutsideTLAB.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/compiler/TestAllocOutsideTLAB.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test that when an object is allocated outside a TLAB an event will be triggered.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm -XX:+UseTLAB -XX:-FastTLABRefill -XX:TLABSize=90k -XX:-ResizeTLAB -XX:TLABRefillWasteFraction=256 jdk.jfr.event.compiler.TestAllocOutsideTLAB
  * @run main/othervm -XX:+UseTLAB -XX:-FastTLABRefill -XX:TLABSize=90k -XX:-ResizeTLAB -XX:TLABRefillWasteFraction=256 jdk.jfr.event.compiler.TestAllocOutsideTLAB
--- a/test/jdk/jdk/jfr/event/compiler/TestCodeCacheConfig.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/compiler/TestCodeCacheConfig.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.Events;
 import sun.hotspot.WhiteBox;
 
-/*
+/**
  * @test TestCodeCacheConfig
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/jdk/jdk/jfr/event/compiler/TestCodeCacheFull.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/compiler/TestCodeCacheFull.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,8 +35,9 @@
 import sun.hotspot.WhiteBox;
 import sun.hotspot.code.BlobType;
 
-/*
+/**
  * @test TestCodeCacheFull
+ * @requires vm.hasJFR
  *
  * @library /test/lib
  * @modules jdk.jfr
--- a/test/jdk/jdk/jfr/event/compiler/TestCodeCacheStats.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/compiler/TestCodeCacheStats.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,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.event.compiler.TestCodeCacheStats
  */
--- a/test/jdk/jdk/jfr/event/compiler/TestCodeSweeper.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/compiler/TestCodeSweeper.java	Fri Jul 20 09:46:57 2018 +0200
@@ -51,9 +51,10 @@
  * event is received, the event is verified. If an event is missing, we do NOT
  * fail.
  */
-/*
+/**
  * @test TestCodeSweeper
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/jdk/jdk/jfr/event/compiler/TestCodeSweeperConfig.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/compiler/TestCodeSweeperConfig.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,9 +33,10 @@
 import jdk.test.lib.jfr.Events;
 
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm -XX:+UseCodeCacheFlushing -XX:-SegmentedCodeCache jdk.jfr.event.compiler.TestCodeSweeperConfig
  * @run main/othervm -XX:+UseCodeCacheFlushing -XX:+SegmentedCodeCache jdk.jfr.event.compiler.TestCodeSweeperConfig
--- a/test/jdk/jdk/jfr/event/compiler/TestCodeSweeperStats.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/compiler/TestCodeSweeperStats.java	Fri Jul 20 09:46:57 2018 +0200
@@ -41,9 +41,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.Utils;
 
-/*
+/**
  * @test TestCodeSweeperStats
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @requires vm.compMode!="Xint"
  * @build sun.hotspot.WhiteBox
--- a/test/jdk/jdk/jfr/event/compiler/TestCompilerCompile.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/compiler/TestCompilerCompile.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,9 +39,10 @@
 import jdk.test.lib.jfr.Events;
 import sun.hotspot.WhiteBox;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.compMode!="Xint"
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
--- a/test/jdk/jdk/jfr/event/compiler/TestCompilerConfig.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/compiler/TestCompilerConfig.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,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.event.compiler.TestCompilerConfig
  */
--- a/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/compiler/TestCompilerInlining.java	Fri Jul 20 09:46:57 2018 +0200
@@ -43,11 +43,12 @@
 import java.util.*;
 import java.util.stream.IntStream;
 
-/*
+/**
  * @test CompilerInliningTest
  * @bug 8073607
  * @key jfr
  * @summary Verifies that corresponding JFR events are emitted in case of inlining.
+ * @requires vm.hasJFR
  *
  * @requires vm.opt.Inline == true | vm.opt.Inline == null
  * @library /test/lib
--- a/test/jdk/jdk/jfr/event/compiler/TestCompilerPhase.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/compiler/TestCompilerPhase.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,10 @@
 import jdk.test.lib.jfr.Events;
 import sun.hotspot.WhiteBox;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.compMode!="Xint" & vm.flavor == "server" & (vm.opt.TieredStopAtLevel == 4 | vm.opt.TieredStopAtLevel == null)
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
--- a/test/jdk/jdk/jfr/event/compiler/TestCompilerStats.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/compiler/TestCompilerStats.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,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.event.compiler.TestCompilerStats
  */
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSConcurrent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSConcurrent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.collection;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  * @requires vm.opt.ExplicitGCInvokesConcurrent != false
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSMarkSweep.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithCMSMarkSweep.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.collection;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1ConcurrentMark.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1ConcurrentMark.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.collection;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "G1" | vm.gc == null
  * @requires vm.opt.ExplicitGCInvokesConcurrent != false
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1FullCollection.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithG1FullCollection.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.collection;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "G1" | vm.gc == null
  * @requires vm.opt.ExplicitGCInvokesConcurrent != true
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithPSMarkSweep.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithPSMarkSweep.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.collection;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.collection;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithSerial.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCCauseWithSerial.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.collection;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "Serial" | vm.gc == null
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSConcurrent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSConcurrent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.collection;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != false
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSMarkSweep.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSMarkSweep.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.collection;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1ConcurrentMark.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1ConcurrentMark.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.collection;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires (vm.gc == "G1" | vm.gc == null)
  *           & vm.opt.ExplicitGCInvokesConcurrent != false
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1FullCollection.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1FullCollection.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.collection;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires (vm.gc == "G1" | vm.gc == null)
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithPSMarkSweep.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithPSMarkSweep.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.collection;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithParNew.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithParNew.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.collection;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithParallelOld.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithParallelOld.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.collection;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithSerial.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCEventMixedWithSerial.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.collection;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "Serial" | vm.gc == null
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCGarbageCollectionEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCGarbageCollectionEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm -Xlog:gc*=debug -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps jdk.jfr.event.gc.collection.TestGCGarbageCollectionEvent
  */
--- a/test/jdk/jdk/jfr/event/gc/collection/TestGCWithFasttime.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestGCWithFasttime.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,9 +33,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
   * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseParallelGC -XX:+UseParallelOldGC jdk.jfr.event.gc.collection.TestGCWithFasttime
--- a/test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithDefNew.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithDefNew.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.collection;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Serial" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -Xmx50m -Xmn2m -XX:+UseSerialGC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xlog:gc+heap=trace,gc*=debug jdk.jfr.event.gc.collection.TestYoungGarbageCollectionEventWithDefNew
--- a/test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithG1New.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithG1New.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.collection;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "G1" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -Xmx50m -Xmn2m -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xlog:gc+heap=trace,gc*=debug jdk.jfr.event.gc.collection.TestYoungGarbageCollectionEventWithG1New
--- a/test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParNew.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParNew.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.collection;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm -Xmx50m -Xmn2m -XX:+UseConcMarkSweepGC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xlog:gc+heap=trace,gc*=debug jdk.jfr.event.gc.collection.TestYoungGarbageCollectionEventWithParNew
--- a/test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParallelScavenge.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParallelScavenge.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.collection;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -Xmx50m -Xmn2m -XX:+UseParallelGC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:-UseAdaptiveSizePolicy -Xlog:gc+heap=trace,gc*=debug jdk.jfr.event.gc.collection.TestYoungGarbageCollectionEventWithParallelScavenge
--- a/test/jdk/jdk/jfr/event/gc/configuration/TestGCConfigurationEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/configuration/TestGCConfigurationEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,10 @@
 import jdk.test.lib.jfr.EventVerifier;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "Parallel" | vm.gc == null)
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/configuration/TestGCConfigurationEventWithDefaultPauseTarget.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/configuration/TestGCConfigurationEventWithDefaultPauseTarget.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,10 @@
 import jdk.test.lib.jfr.EventVerifier;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps jdk.jfr.event.gc.configuration.TestGCConfigurationEventWithDefaultPauseTarget
  */
--- a/test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWith32BitOops.sh	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWith32BitOops.sh	Fri Jul 20 09:46:57 2018 +0200
@@ -22,6 +22,7 @@
 #
 # @test TestGCHeapConfigurationEventWith32BitOops
 # @key jfr
+# @requires vm.hasJFR
 # @requires vm.gc == "Parallel" | vm.gc == null
 # @library /test/lib /test/jdk
 # @build jdk.jfr.event.gc.configuration.TestGCHeapConfigurationEventWith32BitOops sun.hotspot.WhiteBox
--- a/test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithHeapBasedOops.sh	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithHeapBasedOops.sh	Fri Jul 20 09:46:57 2018 +0200
@@ -22,6 +22,7 @@
 #
 # @test TestGCHeapConfigurationEventWithHeapBasedOops
 # @key jfr
+# @requires vm.hasJFR
 # @requires vm.gc == "Parallel" | vm.gc == null
 # @library /test/lib /test/jdk
 # @build jdk.jfr.event.gc.configuration.TestGCHeapConfigurationEventWithHeapBasedOops
--- a/test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithZeroBasedOops.sh	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithZeroBasedOops.sh	Fri Jul 20 09:46:57 2018 +0200
@@ -22,6 +22,7 @@
 #
 # @test TestGCHeapConfigurationEventWithZeroBasedOops
 # @key jfr
+# @requires vm.hasJFR
 # @requires vm.gc == "Parallel" | vm.gc == null
 # @library /test/lib /test/jdk
 # @build jdk.jfr.event.gc.configuration.TestGCHeapConfigurationEventWithZeroBasedOops
--- a/test/jdk/jdk/jfr/event/gc/configuration/TestGCSurvivorConfigurationEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/configuration/TestGCSurvivorConfigurationEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,10 @@
 import jdk.test.lib.jfr.EventVerifier;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:MaxTenuringThreshold=13 -XX:InitialTenuringThreshold=9 jdk.jfr.event.gc.configuration.TestGCSurvivorConfigurationEvent
--- a/test/jdk/jdk/jfr/event/gc/configuration/TestGCTLABConfigurationEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/configuration/TestGCTLABConfigurationEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,10 @@
 import jdk.test.lib.jfr.EventVerifier;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:+UseTLAB -XX:MinTLABSize=3k -XX:TLABRefillWasteFraction=96 jdk.jfr.event.gc.configuration.TestGCTLABConfigurationEvent
--- a/test/jdk/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithMinAndMaxSize.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithMinAndMaxSize.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,9 +30,10 @@
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run driver jdk.jfr.event.gc.configuration.TestGCYoungGenerationConfigurationEventWithMinAndMaxSize
  */
--- a/test/jdk/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithNewRatio.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithNewRatio.java	Fri Jul 20 09:46:57 2018 +0200
@@ -28,9 +28,10 @@
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.test.lib.jfr.EventVerifier;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:NewRatio=4 jdk.jfr.event.gc.configuration.TestGCYoungGenerationConfigurationEventWithNewRatio
  */
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestCMSConcurrentModeFailureEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestCMSConcurrentModeFailureEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestEvacuationFailedEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestEvacuationFailedEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @library /test/lib /test/jdk
  * @requires vm.gc == "G1" | vm.gc == null
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestEvacuationInfoEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestEvacuationInfoEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,9 +36,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "G1" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:G1HeapRegionSize=1m -Xmx64m -Xmn16m -XX:+UseG1GC jdk.jfr.event.gc.detailed.TestEvacuationInfoEvent
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestG1AIHOPEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestG1AIHOPEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "G1" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:NewSize=2m -XX:MaxNewSize=2m -Xmx32m -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+G1UseAdaptiveIHOP jdk.jfr.event.gc.detailed.TestG1AIHOPEvent
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestG1ConcurrentModeFailureEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestG1ConcurrentModeFailureEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "G1" | vm.gc == null
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestG1EvacMemoryStatsEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestG1EvacMemoryStatsEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "G1" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:NewSize=2m -XX:MaxNewSize=2m -Xmx32m -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps jdk.jfr.event.gc.detailed.TestG1EvacMemoryStatsEvent
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestG1HeapRegionTypeChangeEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestG1HeapRegionTypeChangeEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @bug 8149650
+ * @requires vm.hasJFR
  * @requires vm.gc == "G1" | vm.gc == null
  * @key jfr
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestG1IHOPEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestG1IHOPEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "G1" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:NewSize=2m -XX:MaxNewSize=2m -Xmx32m -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:-G1UseAdaptiveIHOP jdk.jfr.event.gc.detailed.TestG1IHOPEvent
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestG1MMUEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestG1MMUEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "G1" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:NewSize=2m -XX:MaxNewSize=2m -Xmx32m -XX:+UseG1GC -XX:MaxGCPauseMillis=75 -XX:GCPauseIntervalMillis=150 -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps jdk.jfr.event.gc.detailed.TestG1MMUEvent
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionEventWithG1.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionEventWithG1.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,10 +24,11 @@
  */
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test that events are created when an object is aged or promoted during a GC and the copying of the object requires a new PLAB or direct heap allocation
+ * @requires vm.hasJFR
  *
  * @requires (vm.gc == "G1" | vm.gc == null)
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionEventWithParallelScavenge.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionEventWithParallelScavenge.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,10 +24,11 @@
  */
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test that events are created when an object is aged or promoted during a GC and the copying of the object requires a new PLAB or direct heap allocation
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithDefNew.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithDefNew.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "Serial" | vm.gc == null
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParNew.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParNew.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,9 +24,10 @@
  */
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm  jdk.jfr.event.gc.detailed.TestPromotionFailedEventWithParNew
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParallelScavenge.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParallelScavenge.java	Fri Jul 20 09:46:57 2018 +0200
@@ -25,9 +25,10 @@
 
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithCMS.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithCMS.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,8 +24,9 @@
  */
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
+ * @requires vm.hasJFR
  * @requires (vm.gc == "null" | vm.gc == "ConcMarkSweep") & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseConcMarkSweepGC -Xmx64m jdk.jfr.event.gc.detailed.TestStressAllocationGCEventsWithCMS
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithDefNew.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithDefNew.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,8 +24,9 @@
  */
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
+ * @requires vm.hasJFR
  * @requires vm.gc == "null" | vm.gc == "Serial"
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseSerialGC -Xmx64m jdk.jfr.event.gc.detailed.TestStressAllocationGCEventsWithDefNew
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithG1.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithG1.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,8 +24,9 @@
  */
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
+ * @requires vm.hasJFR
  * @requires vm.gc == "null" | vm.gc == "G1"
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseG1GC -Xmx64m jdk.jfr.event.gc.detailed.TestStressAllocationGCEventsWithG1
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParNew.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParNew.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,8 +24,9 @@
  */
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
+ * @requires vm.hasJFR
  * @requires vm.gc == "null" & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseConcMarkSweepGC -Xmx64m jdk.jfr.event.gc.detailed.TestStressAllocationGCEventsWithParNew
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParallel.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParallel.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,8 +24,9 @@
  */
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
+ * @requires vm.hasJFR
  * @requires vm.gc == "null" | vm.gc == "Parallel"
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseParallelGC -Xmx64m jdk.jfr.event.gc.detailed.TestStressAllocationGCEventsWithParallel
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithCMS.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithCMS.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,8 +24,9 @@
  */
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
+ * @requires vm.hasJFR
  * @requires (vm.gc == "null" | vm.gc == "ConcMarkSweep") & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseConcMarkSweepGC -Xmx256m jdk.jfr.event.gc.detailed.TestStressBigAllocationGCEventsWithCMS 1048576
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithDefNew.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithDefNew.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,8 +24,9 @@
  */
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
+ * @requires vm.hasJFR
  * @requires vm.gc == "null" | vm.gc == "Serial"
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseSerialGC -Xmx256m jdk.jfr.event.gc.detailed.TestStressBigAllocationGCEventsWithDefNew 1048576
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithG1.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithG1.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,6 +32,7 @@
  * fits exactly to one region, if not - G1 will allocate another almost empty
  * region as a continue of humongous. Thus we will exhaust memory very fast and
  * test will fail with OOME.
+ * @requires vm.hasJFR
  * @requires vm.gc == "null" | vm.gc == "G1"
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseG1GC -XX:MaxNewSize=5m -Xmx256m -XX:G1HeapRegionSize=1048576 jdk.jfr.event.gc.detailed.TestStressBigAllocationGCEventsWithG1 1048544
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParNew.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParNew.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,8 +24,9 @@
  */
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
+ * @requires vm.hasJFR
  * @requires vm.gc == "null" & !vm.graal.enabled
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseConcMarkSweepGC -Xmx256m jdk.jfr.event.gc.detailed.TestStressBigAllocationGCEventsWithParNew 1048576
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParallel.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParallel.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,8 +24,9 @@
  */
 package jdk.jfr.event.gc.detailed;
 
-/*
+/**
  * @test
+ * @requires vm.hasJFR
  * @requires vm.gc == "null" | vm.gc == "Parallel"
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseParallelGC -Xmx256m jdk.jfr.event.gc.detailed.TestStressBigAllocationGCEventsWithParallel 1048576
--- a/test/jdk/jdk/jfr/event/gc/detailed/TestTenuringDistributionEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/detailed/TestTenuringDistributionEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @bug 8009538
+ * @requires vm.hasJFR
  * @requires vm.gc == "G1" | vm.gc == null
  * @key jfr
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryCommittedSize.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryCommittedSize.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,9 +36,10 @@
 import jdk.test.lib.jfr.GCHelper;
 import sun.hotspot.WhiteBox;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
  * @build sun.hotspot.WhiteBox
--- a/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventConcurrentCMS.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventConcurrentCMS.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != false
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventDefNewSerial.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventDefNewSerial.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.heapsummary;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Serial" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseSerialGC jdk.jfr.event.gc.heapsummary.TestHeapSummaryEventDefNewSerial
--- a/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventG1.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventG1.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.heapsummary;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "G1" | vm.gc == null)
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSParOld.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSParOld.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.heapsummary;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC jdk.jfr.event.gc.heapsummary.TestHeapSummaryEventPSParOld
--- a/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSSerial.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSSerial.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.heapsummary;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:-UseParallelOldGC -XX:+UseParallelGC jdk.jfr.event.gc.heapsummary.TestHeapSummaryEventPSSerial
--- a/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventParNewCMS.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventParNewCMS.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.heapsummary;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSConcurrent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSConcurrent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.objectcount;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != false
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSMarkSweep.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSMarkSweep.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.objectcount;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1ConcurrentMark.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1ConcurrentMark.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.objectcount;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "G1" | vm.gc == null)
  *           & vm.opt.ExplicitGCInvokesConcurrent != false
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1FullCollection.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1FullCollection.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.objectcount;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "G1" | vm.gc == null)
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithPSMarkSweep.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithPSMarkSweep.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.objectcount;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UseParallelGC -XX:-UseParallelOldGC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:MarkSweepDeadRatio=0 -XX:-UseCompressedOops -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountAfterGCEventWithPSMarkSweep
--- a/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithParallelOld.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithParallelOld.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.objectcount;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:MarkSweepDeadRatio=0 -XX:-UseCompressedOops -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountAfterGCEventWithParallelOld
--- a/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithSerial.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithSerial.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.objectcount;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Serial" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseSerialGC -XX:MarkSweepDeadRatio=0 -XX:-UseCompressedOops -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountAfterGCEventWithSerial
--- a/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/objectcount/TestObjectCountEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Serial" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseSerialGC -XX:-UseCompressedOops -XX:MarkSweepDeadRatio=0 -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountEvent
--- a/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSConcurrent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSConcurrent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.refstat;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != false
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSMarkSweep.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSMarkSweep.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.refstat;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "ConcMarkSweep" | vm.gc == null) & !vm.graal.enabled
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithDefNew.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithDefNew.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.refstat;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Serial" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm  -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xlog:gc+heap=trace,gc*=debug -Xmx50m -Xmn2m -XX:+UseSerialGC jdk.jfr.event.gc.refstat.TestRefStatEventWithDefNew
--- a/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1ConcurrentMark.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1ConcurrentMark.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.refstat;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "G1" | vm.gc == null)
  *           & vm.opt.ExplicitGCInvokesConcurrent != false
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1FullCollection.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1FullCollection.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.refstat;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires (vm.gc == "G1" | vm.gc == null)
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1New.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1New.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.refstat;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "G1" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xlog:gc+heap=trace,gc*=debug -Xmx50m -Xmn2m -XX:+UseG1GC jdk.jfr.event.gc.refstat.TestRefStatEventWithG1New
--- a/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithPSMarkSweep.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithPSMarkSweep.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.refstat;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xlog:gc+heap=trace,gc*=debug -XX:+UseParallelGC -XX:-UseParallelOldGC jdk.jfr.event.gc.refstat.TestRefStatEventWithPSMarkSweep
--- a/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelOld.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelOld.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.refstat;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xlog:gc+heap=trace,gc*=debug -XX:+UseParallelGC -XX:+UseParallelOldGC jdk.jfr.event.gc.refstat.TestRefStatEventWithParallelOld
--- a/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelScavenge.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelScavenge.java	Fri Jul 20 09:46:57 2018 +0200
@@ -26,9 +26,10 @@
 package jdk.jfr.event.gc.refstat;
 import jdk.test.lib.jfr.GCHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xlog:gc+heap=trace,gc*=debug -Xmx50m -Xmn2m -XX:-UseLargePages -XX:+UseParallelGC -XX:-UseAdaptiveSizePolicy jdk.jfr.event.gc.refstat.TestRefStatEventWithParallelScavenge
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestConcMarkSweepAllocationPendingStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestConcMarkSweepAllocationPendingStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,9 +24,10 @@
  */
 package jdk.jfr.event.gc.stacktrace;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires (vm.gc == "null" | vm.gc == "ConcMarkSweep") & !vm.graal.enabled
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,9 +24,10 @@
  */
 package jdk.jfr.event.gc.stacktrace;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "null" | vm.gc == "Serial"
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,9 +24,10 @@
  */
 package jdk.jfr.event.gc.stacktrace;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "null" | vm.gc == "G1"
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,9 +24,10 @@
  */
 package jdk.jfr.event.gc.stacktrace;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "null" | vm.gc == "G1"
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,9 +24,10 @@
  */
 package jdk.jfr.event.gc.stacktrace;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "null" | vm.gc == "G1"
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,9 +24,10 @@
  */
 package jdk.jfr.event.gc.stacktrace;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "null" | vm.gc == "Serial"
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,9 +24,10 @@
  */
 package jdk.jfr.event.gc.stacktrace;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires (vm.gc == "null" | vm.gc == "ConcMarkSweep") & !vm.graal.enabled
  * @requires !(vm.compMode == "Xcomp" & os.arch == "aarch64")
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -23,9 +23,10 @@
  * questions.
  */
 package jdk.jfr.event.gc.stacktrace;
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "null" | vm.gc == "G1"
  * @requires !(vm.compMode == "Xcomp" & os.arch == "aarch64")
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,9 +24,10 @@
  */
 package jdk.jfr.event.gc.stacktrace;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "null" | vm.gc == "Parallel"
  * @requires !(vm.compMode == "Xcomp" & os.arch == "aarch64")
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,9 +24,10 @@
  */
 package jdk.jfr.event.gc.stacktrace;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "null" | vm.gc == "Serial"
  * @requires !(vm.compMode == "Xcomp" & os.arch == "aarch64")
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestParNewAllocationPendingStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestParNewAllocationPendingStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,9 +24,10 @@
  */
 package jdk.jfr.event.gc.stacktrace;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires (vm.gc == "null" | vm.gc == "ConcMarkSweep") & !vm.graal.enabled
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,9 +24,10 @@
  */
 package jdk.jfr.event.gc.stacktrace;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "null" | vm.gc == "Parallel"
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -24,9 +24,10 @@
  */
 package jdk.jfr.event.gc.stacktrace;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @requires vm.gc == "null" | vm.gc == "Parallel"
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/io/EvilInstrument.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/io/EvilInstrument.java	Fri Jul 20 09:46:57 2018 +0200
@@ -46,6 +46,7 @@
  * @summary This test runs JFR with a javaagent that reads/writes files and
  * sockets during every class definition. This is to verify that the i/o
  * instrumentation in JFR does not interfere with javaagents.
+ * @requires vm.hasJFR
  *
  * @library /test/lib /test/jdk
  * @modules java.instrument
--- a/test/jdk/jdk/jfr/event/io/TestDisabledEvents.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/io/TestDisabledEvents.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,10 +39,11 @@
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test with FlightRecorder enabled but with the events disabled.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.event.io.TestDisabledEvents
  */
--- a/test/jdk/jdk/jfr/event/io/TestFileChannelEvents.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/io/TestFileChannelEvents.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,9 +39,10 @@
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.event.io.TestFileChannelEvents
  */
--- a/test/jdk/jdk/jfr/event/io/TestFileReadOnly.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/io/TestFileReadOnly.java	Fri Jul 20 09:46:57 2018 +0200
@@ -40,9 +40,10 @@
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.event.io.TestFileReadOnly
  */
--- a/test/jdk/jdk/jfr/event/io/TestFileStreamEvents.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/io/TestFileStreamEvents.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 TestFileStreamEvents
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.event.io.TestFileStreamEvents
  */
--- a/test/jdk/jdk/jfr/event/io/TestInstrumentation.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/io/TestInstrumentation.java	Fri Jul 20 09:46:57 2018 +0200
@@ -47,6 +47,7 @@
  * @test
  * @summary Test that will instrument the same classes that JFR will also instrument.
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @library /test/lib /test/jdk
  * @modules java.base/jdk.internal.org.objectweb.asm
--- a/test/jdk/jdk/jfr/event/io/TestRandomAccessFileEvents.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/io/TestRandomAccessFileEvents.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,9 +37,10 @@
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.event.io.TestRandomAccessFileEvents
  */
--- a/test/jdk/jdk/jfr/event/io/TestRandomAccessFileThread.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/io/TestRandomAccessFileThread.java	Fri Jul 20 09:46:57 2018 +0200
@@ -42,10 +42,11 @@
 import jdk.test.lib.thread.XRun;
 
 
-/*
+/**
  * @test
  * @summary Verify the event time stamp and thread name
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps jdk.jfr.event.io.TestRandomAccessFileThread
  */
--- a/test/jdk/jdk/jfr/event/io/TestSocketChannelEvents.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/io/TestSocketChannelEvents.java	Fri Jul 20 09:46:57 2018 +0200
@@ -41,9 +41,10 @@
 import jdk.test.lib.thread.TestThread;
 import jdk.test.lib.thread.XRun;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.event.io.TestSocketChannelEvents
  */
--- a/test/jdk/jdk/jfr/event/io/TestSocketEvents.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/io/TestSocketEvents.java	Fri Jul 20 09:46:57 2018 +0200
@@ -42,9 +42,10 @@
 import jdk.test.lib.thread.TestThread;
 import jdk.test.lib.thread.XRun;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.event.io.TestSocketEvents
  */
--- a/test/jdk/jdk/jfr/event/metadata/TestDefaultConfigurations.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/metadata/TestDefaultConfigurations.java	Fri Jul 20 09:46:57 2018 +0200
@@ -53,9 +53,10 @@
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @library /test/lib
  * @modules java.xml
--- a/test/jdk/jdk/jfr/event/metadata/TestEventMetadata.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/metadata/TestEventMetadata.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.event.metadata.TestEventMetadata
  */
--- a/test/jdk/jdk/jfr/event/oldobject/TestAllocationTime.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestAllocationTime.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,9 +37,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
--- a/test/jdk/jdk/jfr/event/oldobject/TestArrayInformation.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestArrayInformation.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,9 +36,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
--- a/test/jdk/jdk/jfr/event/oldobject/TestCMS.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestCMS.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null" & !vm.graal.enabled
  * @summary Test leak profiler with CMS GC
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/oldobject/TestCircularReference.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestCircularReference.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,9 +33,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
--- a/test/jdk/jdk/jfr/event/oldobject/TestClassLoaderLeak.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestClassLoaderLeak.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
--- a/test/jdk/jdk/jfr/event/oldobject/TestFieldInformation.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestFieldInformation.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
--- a/test/jdk/jdk/jfr/event/oldobject/TestG1.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestG1.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @summary Test leak profiler with G1 GC
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/oldobject/TestHeapDeep.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestHeapDeep.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,9 +33,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
--- a/test/jdk/jdk/jfr/event/oldobject/TestHeapShallow.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestHeapShallow.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,10 @@
 import jdk.jfr.internal.test.WhiteBox;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
--- a/test/jdk/jdk/jfr/event/oldobject/TestLargeRootSet.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestLargeRootSet.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
--- a/test/jdk/jdk/jfr/event/oldobject/TestLastKnownHeapUsage.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestLastKnownHeapUsage.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,9 +37,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
--- a/test/jdk/jdk/jfr/event/oldobject/TestListenerLeak.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestListenerLeak.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
--- a/test/jdk/jdk/jfr/event/oldobject/TestMetadataRetention.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestMetadataRetention.java	Fri Jul 20 09:46:57 2018 +0200
@@ -41,9 +41,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.TestClassLoader;
 
-/*
+/**
  * @test
  * @summary The test verifies that an old object sample maintains references to "stale" metadata
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @key jfr
  * @modules jdk.jfr/jdk.jfr.internal.test
--- a/test/jdk/jdk/jfr/event/oldobject/TestObjectDescription.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestObjectDescription.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,9 +39,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
--- a/test/jdk/jdk/jfr/event/oldobject/TestParallel.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestParallel.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @summary Test leak profiler with Parallel GC
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/oldobject/TestParallelOld.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestParallelOld.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @summary Test leak profiler with Parallel Old GC
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/oldobject/TestReferenceChainLimit.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestReferenceChainLimit.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
--- a/test/jdk/jdk/jfr/event/oldobject/TestSanityDefault.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestSanityDefault.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,9 +33,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @library /test/lib /test/jdk
  * @summary Purpose of this test is to run leak profiler without command line tweaks or WhiteBox hacks until we succeed
--- a/test/jdk/jdk/jfr/event/oldobject/TestSerial.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestSerial.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @requires vm.gc == "null"
  * @summary Test leak profiler with Serial GC
  * @library /test/lib /test/jdk
--- a/test/jdk/jdk/jfr/event/oldobject/TestThreadLocalLeak.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/oldobject/TestThreadLocalLeak.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal.test
  * @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestThreadLocalLeak
--- a/test/jdk/jdk/jfr/event/os/TestCPUInformation.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/os/TestCPUInformation.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,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.event.os.TestCPUInformation
  */
--- a/test/jdk/jdk/jfr/event/os/TestCPULoad.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/os/TestCPULoad.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,9 +33,10 @@
 import jdk.test.lib.jfr.Events;
 
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.event.os.TestCPULoad
  */
--- a/test/jdk/jdk/jfr/event/os/TestCPUTimeStampCounter.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/os/TestCPUTimeStampCounter.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,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.event.os.TestCPUTimeStampCounter
  */
--- a/test/jdk/jdk/jfr/event/os/TestInitialEnvironmentVariable.sh	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/os/TestInitialEnvironmentVariable.sh	Fri Jul 20 09:46:57 2018 +0200
@@ -22,9 +22,11 @@
 #
 # @test
 # @key jfr
+# @requires vm.hasJFR
 # @library /test/lib
 # @build jdk.jfr.event.os.TestInitialEnvironmentVariable
 # @run shell TestInitialEnvironmentVariable.sh
+
 echo -------------------------------------------------------------
 echo "TESTCLASSES='$TESTCLASSES'"
 echo "TESTSRC='$TESTSRC'"
--- a/test/jdk/jdk/jfr/event/os/TestOSInfo.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/os/TestOSInfo.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,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.event.os.TestOSInfo
  */
--- a/test/jdk/jdk/jfr/event/os/TestPhysicalMemoryEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/os/TestPhysicalMemoryEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,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.event.os.TestPhysicalMemoryEvent
  */
--- a/test/jdk/jdk/jfr/event/os/TestSystemProcess.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/os/TestSystemProcess.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,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.event.os.TestSystemProcess
  */
--- a/test/jdk/jdk/jfr/event/os/TestThreadContextSwitches.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/os/TestThreadContextSwitches.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,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.event.os.TestThreadContextSwitches
  */
--- a/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/profiling/TestFullStackTrace.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,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.event.profiling.TestFullStackTrace
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestActiveRecordingEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestActiveRecordingEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -43,10 +43,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Tests that the recording properties are properly reflected in the ActiveRecording event
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.event.runtime.TestActiveRecordingEvent
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestActiveSettingEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -40,10 +40,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Tests that active setting are available in the ActiveSettingevent
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.event.runtime.TestActiveSettingEvent
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,9 +37,10 @@
 import java.util.concurrent.FutureTask;
 import java.util.stream.Collectors;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  *
  * @run main/othervm jdk.jfr.event.runtime.TestBiasedLockRevocationEvents
--- a/test/jdk/jdk/jfr/event/runtime/TestClassDefineEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestClassDefineEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,9 +36,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.TestClassLoader;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @build jdk.jfr.event.runtime.TestClasses
  * @run main/othervm jdk.jfr.event.runtime.TestClassDefineEvent
--- a/test/jdk/jdk/jfr/event/runtime/TestClassLoadEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestClassLoadEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,9 +37,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.TestClassLoader;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @build jdk.jfr.event.runtime.TestClasses
  * @run main/othervm jdk.jfr.event.runtime.TestClassLoadEvent
--- a/test/jdk/jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,9 +39,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @build jdk.jfr.event.runtime.TestClasses
  * @run main/othervm jdk.jfr.event.runtime.TestClassLoaderStatsEvent
--- a/test/jdk/jdk/jfr/event/runtime/TestClassLoadingStatisticsEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestClassLoadingStatisticsEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.TestClassLoader;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @build jdk.jfr.event.runtime.TestClasses
  * @run main/othervm jdk.jfr.event.runtime.TestClassLoadingStatisticsEvent
--- a/test/jdk/jdk/jfr/event/runtime/TestClassUnloadEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestClassUnloadEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.TestClassLoader;
 
-/*
+/**
  * @test
  * @summary The test verifies that a class unload event is created when class is unloaded
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @build jdk.jfr.event.runtime.TestClasses
  * @run main/othervm -Xlog:class+unload -Xlog:gc -Xmx16m jdk.jfr.event.runtime.TestClassUnloadEvent
--- a/test/jdk/jdk/jfr/event/runtime/TestExceptionEvents.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestExceptionEvents.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,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.event.runtime.TestExceptionEvents
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestExceptionSubclass.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestExceptionSubclass.java	Fri Jul 20 09:46:57 2018 +0200
@@ -27,10 +27,11 @@
 
 import java.util.concurrent.TimeUnit;
 
-/*
+/**
  * @test
  * @key jfr
  * @bug 8013122
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.event.runtime.TestExceptionSubclass
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestJavaBlockedEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestJavaBlockedEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -40,9 +40,10 @@
 import jdk.test.lib.thread.TestThread;
 import jdk.test.lib.thread.XRun;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  *
  * @run main/othervm jdk.jfr.event.runtime.TestJavaBlockedEvent
--- a/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorInflateEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorInflateEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,10 @@
 import jdk.test.lib.thread.TestThread;
 import jdk.test.lib.thread.XRun;
 
-/*
+/**
  * @test TestJavaMonitorInflateEvent
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.event.runtime.TestJavaMonitorInflateEvent
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorWaitEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorWaitEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,10 @@
 import jdk.test.lib.thread.TestThread;
 import jdk.test.lib.thread.XRun;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.event.runtime.TestJavaMonitorWaitEvent
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorWaitTimeOut.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestJavaMonitorWaitTimeOut.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,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.event.runtime.TestJavaMonitorWaitTimeOut
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestJavaThreadStatisticsEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestJavaThreadStatisticsEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,9 +37,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.event.runtime.TestJavaThreadStatisticsEvent
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestJavaThreadStatisticsEventBean.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestJavaThreadStatisticsEventBean.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,9 +37,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.event.runtime.TestJavaThreadStatisticsEventBean
--- a/test/jdk/jdk/jfr/event/runtime/TestModuleEvents.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestModuleEvents.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Tests the JFR events related to modules
  * @key jfr
+ * @requires vm.hasJFR
  * @requires !vm.graal.enabled
  * @library /test/lib
  * @run main/othervm --limit-modules java.base,jdk.jfr jdk.jfr.event.runtime.TestModuleEvents
--- a/test/jdk/jdk/jfr/event/runtime/TestNativeLibrariesEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestNativeLibrariesEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,9 +37,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.event.runtime.TestNativeLibrariesEvent
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestNetworkUtilizationEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestNetworkUtilizationEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -43,9 +43,10 @@
 import static java.util.stream.Collectors.averagingLong;
 import static java.util.stream.Collectors.groupingBy;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  *
  * @run main/othervm jdk.jfr.event.runtime.TestNetworkUtilizationEvent
--- a/test/jdk/jdk/jfr/event/runtime/TestSafepointEvents.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestSafepointEvents.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,10 @@
 import jdk.test.lib.jfr.Events;
 import sun.hotspot.WhiteBox;
 
-/*
+/**
  * @test TestSafepointEvents
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/test/jdk/jdk/jfr/event/runtime/TestSizeTFlags.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestSizeTFlags.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @bug 8058552
+ * @requires vm.hasJFR
  * @requires vm.gc == "G1" | vm.gc == null
  * @key jfr
  * @summary Test checks that flags of type size_t are being sent to the jfr
--- a/test/jdk/jdk/jfr/event/runtime/TestSystemPropertyEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestSystemPropertyEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,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.event.runtime.TestSystemPropertyEvent
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestThreadAllocationEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestThreadAllocationEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -43,9 +43,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr
  *          jdk.management
--- a/test/jdk/jdk/jfr/event/runtime/TestThreadCpuTimeEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestThreadCpuTimeEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -43,9 +43,10 @@
 import java.util.concurrent.CyclicBarrier;
 import java.util.stream.Collectors;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr
  *          jdk.management
--- a/test/jdk/jdk/jfr/event/runtime/TestThreadDumpEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestThreadDumpEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,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.event.runtime.TestThreadDumpEvent
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestThreadParkEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestThreadParkEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -41,9 +41,10 @@
 import jdk.test.lib.thread.TestThread;
 
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  *
  * @run main/othervm jdk.jfr.event.runtime.TestThreadParkEvent
--- a/test/jdk/jdk/jfr/event/runtime/TestThreadSleepEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestThreadSleepEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,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.event.runtime.TestThreadSleepEvent
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestThreadStartEndEvents.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestThreadStartEndEvents.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,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.event.runtime.TestThreadStartEndEvents
  */
--- a/test/jdk/jdk/jfr/event/runtime/TestThrowableInstrumentation.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestThrowableInstrumentation.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,10 +29,11 @@
 import java.util.Objects;
 import jdk.test.lib.Platform;
 
-/*
+/**
  * @test
  * @bug 8153324
  * @summary Verify instrumented Throwable bytecode by compiling it with C1.
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
--- a/test/jdk/jdk/jfr/event/runtime/TestVMInfoEvent.sh	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestVMInfoEvent.sh	Fri Jul 20 09:46:57 2018 +0200
@@ -22,6 +22,7 @@
 #
 # @test
 # @key jfr
+# @requires vm.hasJFR
 # @library /test/lib /test/jdk
 # @build jdk.jfr.event.runtime.TestVMInfoEvent
 # @run shell TestVMInfoEvent.sh
--- a/test/jdk/jdk/jfr/event/runtime/TestVMOperation.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestVMOperation.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,8 +34,9 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
+ * @requires vm.hasJFR
  * @requires vm.gc == "Parallel" | vm.gc == null
  * @key jfr
  * @library /test/lib
--- a/test/jdk/jdk/jfr/event/runtime/TestVmFlagChangedEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/runtime/TestVmFlagChangedEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,9 +37,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test TestVmFlagChangedEvent
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr
  *          jdk.management
--- a/test/jdk/jdk/jfr/event/sampling/TestNative.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/event/sampling/TestNative.java	Fri Jul 20 09:46:57 2018 +0200
@@ -40,6 +40,7 @@
 /*
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @run main/native jdk.jfr.event.sampling.TestNative
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdChangeLogLevel.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdChangeLogLevel.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,10 +35,11 @@
 import jdk.test.lib.dcmd.JcmdExecutor;
 import jdk.test.lib.dcmd.PidJcmdExecutor;
 
-/*
+/**
  * @test TestJcmdLogLevelChange
  * @key jfr
  * @summary Test changing log level
+ * @requires vm.hasJFR
  *
  * @library /test/lib /test/jdk
  *
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdConfigure.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,10 +32,11 @@
 import jdk.jfr.internal.Options;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary The test verifies JFR.configure command
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal
  * @run main/othervm jdk.jfr.jcmd.TestJcmdConfigure
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdDump.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdDump.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,10 +38,11 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary The test verifies JFR.dump command
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:FlightRecorderOptions:maxchunksize=1M jdk.jfr.jcmd.TestJcmdDump
  */
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdDumpGeneratedFilename.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdDumpGeneratedFilename.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,10 +35,11 @@
 import jdk.test.lib.jfr.FileHelper;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary The test verifies JFR.dump command
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jcmd.TestJcmdDumpGeneratedFilename
  */
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdDumpLimited.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdDumpLimited.java	Fri Jul 20 09:46:57 2018 +0200
@@ -43,10 +43,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary The test verifies JFR.dump command
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jcmd.TestJcmdDumpLimited
  */
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdDumpPathToGCRoots.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdDumpPathToGCRoots.java	Fri Jul 20 09:46:57 2018 +0200
@@ -41,9 +41,10 @@
 import jdk.jfr.internal.test.WhiteBox;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @summary Start a recording with or without path-to-gc-roots
+ * @requires vm.hasJFR
  * @modules jdk.jfr/jdk.jfr.internal.test
  * @library /test/lib /test/jdk
  * @key jfr
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdLegacy.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdLegacy.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,9 +38,10 @@
 import jdk.test.lib.jfr.FileHelper;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test TestClassId
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal
  * @run main/othervm jdk.jfr.jcmd.TestJcmdLegacy
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdSaveToFile.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdSaveToFile.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,10 +30,11 @@
 import jdk.test.lib.jfr.FileHelper;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary The test verifies that recording can be written to a file both with JFR.start and JFR.stop
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jcmd.TestJcmdSaveToFile
  */
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdStartDirNotExist.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdStartDirNotExist.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,10 +30,11 @@
 
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary Verify error when starting with a dir that does not exist.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStartDirNotExist
  */
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdStartInvaldFile.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdStartInvaldFile.java	Fri Jul 20 09:46:57 2018 +0200
@@ -27,10 +27,11 @@
 
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary Verify error when starting with invalid file.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStartInvaldFile
  */
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdStartPathToGCRoots.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdStartPathToGCRoots.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,10 @@
 import jdk.test.lib.jfr.EventNames;
 
 
-/*
+/**
  * @test
  * @summary Start a recording with or without path-to-gc-roots
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @key jfr
  *
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdStartReadOnlyFile.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdStartReadOnlyFile.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.test.lib.jfr.FileHelper;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary Verify error when starting with read-only file.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStartReadOnlyFile
  */
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdStartStopDefault.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdStartStopDefault.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,10 +34,11 @@
 import jdk.test.lib.jfr.FileHelper;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary Start a recording without name.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStartStopDefault
  */
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdStartWithOptions.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdStartWithOptions.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,10 +32,11 @@
 import jdk.jfr.RecordingState;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary The test verifies that recording can be started with options delay|duration|maxage|maxsize
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:+FlightRecorder -XX:FlightRecorderOptions=maxchunksize=2097152 jdk.jfr.jcmd.TestJcmdStartWithOptions
  */
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdStartWithSettings.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdStartWithSettings.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,10 +35,11 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary The test verifies that recording can be started with setting file(s)
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStartWithSettings
  */
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdStopInvalidFile.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdStopInvalidFile.java	Fri Jul 20 09:46:57 2018 +0200
@@ -27,10 +27,11 @@
 
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary Verify error when stopping with invalid file.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStopInvalidFile
  */
--- a/test/jdk/jdk/jfr/jcmd/TestJcmdStopReadOnlyFile.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jcmd/TestJcmdStopReadOnlyFile.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.test.lib.jfr.FileHelper;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary Verify error when stopping with read-only file.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStopReadOnlyFile
  */
--- a/test/jdk/jdk/jfr/jmx/TestClone.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestClone.java	Fri Jul 20 09:46:57 2018 +0200
@@ -40,9 +40,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestClone
  */
--- a/test/jdk/jdk/jfr/jmx/TestCloneRepeat.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestCloneRepeat.java	Fri Jul 20 09:46:57 2018 +0200
@@ -39,9 +39,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestCloneRepeat
  */
--- a/test/jdk/jdk/jfr/jmx/TestConfigurationInfo.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestConfigurationInfo.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,10 @@
 import jdk.management.jfr.ConfigurationInfo;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestConfigurationInfo
  */
--- a/test/jdk/jdk/jfr/jmx/TestCopyTo.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestCopyTo.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestCopyTo
  */
--- a/test/jdk/jdk/jfr/jmx/TestCopyToInvalidPath.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestCopyToInvalidPath.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,10 @@
 import jdk.test.lib.jfr.CommonHelper;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestCopyToInvalidPath
  */
--- a/test/jdk/jdk/jfr/jmx/TestCopyToReadOnlyDir.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestCopyToReadOnlyDir.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.FileHelper;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestCopyToReadOnlyDir
  */
--- a/test/jdk/jdk/jfr/jmx/TestCopyToRunning.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestCopyToRunning.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,10 +38,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Copy a recording to file while it is running.
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestCopyToRunning
  */
--- a/test/jdk/jdk/jfr/jmx/TestEventTypes.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestEventTypes.java	Fri Jul 20 09:46:57 2018 +0200
@@ -42,10 +42,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Verifies that EventTypes from jmx and FlightRecorder are the same.
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestEventTypes
  */
--- a/test/jdk/jdk/jfr/jmx/TestGetRecordings.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestGetRecordings.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,9 +30,10 @@
 import jdk.management.jfr.FlightRecorderMXBean;
 import jdk.management.jfr.RecordingInfo;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestGetRecordings
  */
--- a/test/jdk/jdk/jfr/jmx/TestGetRecordingsMultiple.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestGetRecordingsMultiple.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.management.jfr.RecordingInfo;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestGetRecordingsMultiple
  */
--- a/test/jdk/jdk/jfr/jmx/TestMultipleRecordings.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestMultipleRecordings.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.management.jfr.FlightRecorderMXBean;
 import jdk.management.jfr.RecordingInfo;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestMultipleRecordings
  */
--- a/test/jdk/jdk/jfr/jmx/TestNotificationListener.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestNotificationListener.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,9 +33,10 @@
 
 import jdk.management.jfr.FlightRecorderMXBean;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestNotificationListener
  */
--- a/test/jdk/jdk/jfr/jmx/TestPredefinedConfiguration.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestPredefinedConfiguration.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,9 +33,10 @@
 import jdk.management.jfr.RecordingInfo;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestPredefinedConfiguration
  */
--- a/test/jdk/jdk/jfr/jmx/TestPredefinedConfigurationInvalid.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestPredefinedConfigurationInvalid.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.test.lib.jfr.CommonHelper;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestPredefinedConfigurationInvalid
  */
--- a/test/jdk/jdk/jfr/jmx/TestRecordingOptions.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestRecordingOptions.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,10 @@
 import jdk.management.jfr.FlightRecorderMXBean;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestRecordingOptions
  */
--- a/test/jdk/jdk/jfr/jmx/TestRecordingSettings.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestRecordingSettings.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,9 +33,10 @@
 import jdk.management.jfr.FlightRecorderMXBean;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestRecordingSettings
  */
--- a/test/jdk/jdk/jfr/jmx/TestRecordingSettingsInvalid.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestRecordingSettingsInvalid.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.management.jfr.FlightRecorderMXBean;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Verify exception when setting invalid settings.
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestRecordingSettingsInvalid
  */
--- a/test/jdk/jdk/jfr/jmx/TestRecordingSettingsMultiple.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestRecordingSettingsMultiple.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,9 +30,10 @@
 
 import jdk.management.jfr.FlightRecorderMXBean;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestRecordingSettingsMultiple
  */
--- a/test/jdk/jdk/jfr/jmx/TestRecordingState.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestRecordingState.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.management.jfr.FlightRecorderMXBean;
 import jdk.management.jfr.RecordingInfo;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestRecordingState
  */
--- a/test/jdk/jdk/jfr/jmx/TestRecordingStateInvalid.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestRecordingStateInvalid.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,9 +33,10 @@
 import jdk.test.lib.jfr.CommonHelper;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestRecordingStateInvalid
  */
--- a/test/jdk/jdk/jfr/jmx/TestSetConfiguration.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestSetConfiguration.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestSetConfiguration
  */
--- a/test/jdk/jdk/jfr/jmx/TestSetConfigurationInvalid.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestSetConfigurationInvalid.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,10 +34,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.EventNames;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Verify Exception when setting invalid config.
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestSetConfigurationInvalid
  */
--- a/test/jdk/jdk/jfr/jmx/TestSnapshot.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestSnapshot.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,8 +34,10 @@
 import jdk.management.jfr.RecordingInfo;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/* @test
+/**
+ * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestSnapshot
  */
--- a/test/jdk/jdk/jfr/jmx/TestStartRecording.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestStartRecording.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,10 @@
 import jdk.management.jfr.EventTypeInfo;
 import jdk.management.jfr.FlightRecorderMXBean;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestStartRecording
  */
--- a/test/jdk/jdk/jfr/jmx/TestStream.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestStream.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,9 +35,10 @@
 import jdk.management.jfr.FlightRecorderMXBean;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestStream
  */
--- a/test/jdk/jdk/jfr/jmx/TestStreamClosed.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestStreamClosed.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Call readStream() after closeStream()
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestStreamClosed
  */
--- a/test/jdk/jdk/jfr/jmx/TestStreamMultiple.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestStreamMultiple.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,10 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.SimpleEventHelper;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestStreamMultiple
  */
--- a/test/jdk/jdk/jfr/jmx/TestWrongId.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/TestWrongId.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,10 +32,11 @@
 import jdk.test.lib.jfr.VoidFunction;
 
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Call functions with invalid argument id. Verify Exception.
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.TestWrongId
  */
--- a/test/jdk/jdk/jfr/jmx/info/TestConfigurationInfo.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/info/TestConfigurationInfo.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.management.jfr.ConfigurationInfo;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test for ConfigurationInfo. Compare infos from java API and jmx API.
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.info.TestConfigurationInfo
  */
--- a/test/jdk/jdk/jfr/jmx/info/TestEventTypeInfo.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/info/TestEventTypeInfo.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,10 +38,11 @@
 import jdk.management.jfr.FlightRecorderMXBean;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test for EventTypeInfo
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.info.TestEventTypeInfo
  */
--- a/test/jdk/jdk/jfr/jmx/info/TestRecordingInfo.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/info/TestRecordingInfo.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,10 +38,11 @@
 import jdk.management.jfr.RecordingInfo;
 import jdk.test.lib.jfr.CommonHelper;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test for RecordingInfo
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.info.TestRecordingInfo
  */
--- a/test/jdk/jdk/jfr/jmx/info/TestSettingDescriptorInfo.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/info/TestSettingDescriptorInfo.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 import jdk.management.jfr.EventTypeInfo;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test for SettingDescriptorInfo. Compare infos from java API and jmx API.
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm jdk.jfr.jmx.info.TestSettingDescriptorInfo
  */
--- a/test/jdk/jdk/jfr/jmx/security/TestEnoughPermission.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/security/TestEnoughPermission.java	Fri Jul 20 09:46:57 2018 +0200
@@ -35,10 +35,11 @@
 import jdk.management.jfr.FlightRecorderMXBean;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test with minimal needed permissions. All functions should work.
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=enough.policy jdk.jfr.jmx.security.TestEnoughPermission
  */
--- a/test/jdk/jdk/jfr/jmx/security/TestNoControlPermission.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/security/TestNoControlPermission.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.test.lib.jfr.CommonHelper;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Verify we get SecurityExceptions when missing management permission "control".
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=nocontrol.policy jdk.jfr.jmx.security.TestNoControlPermission
  */
--- a/test/jdk/jdk/jfr/jmx/security/TestNoMonitorPermission.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/security/TestNoMonitorPermission.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import jdk.test.lib.jfr.CommonHelper;
 import jdk.test.lib.jfr.VoidFunction;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Verify we get SecurityExceptions when missing management permission "monitor".
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=nomonitor.policy jdk.jfr.jmx.security.TestNoMonitorPermission
  */
--- a/test/jdk/jdk/jfr/jmx/security/TestNotificationListenerPermission.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jmx/security/TestNotificationListenerPermission.java	Fri Jul 20 09:46:57 2018 +0200
@@ -37,10 +37,11 @@
 
 import jdk.jfr.jmx.JmxHelper;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Test with minimal needed permissions. All functions should work.
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=listener.policy jdk.jfr.jmx.security.TestNotificationListenerPermission
  */
--- a/test/jdk/jdk/jfr/jvm/TestBeginAndEnd.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestBeginAndEnd.java	Fri Jul 20 09:46:57 2018 +0200
@@ -27,9 +27,10 @@
 
 import jdk.jfr.internal.JVM;
 
-/*
+/**
  * @test TestBeginAndEnd
  * @key jfr
+ * @requires vm.hasJFR
  * @modules jdk.jfr/jdk.jfr.internal
  * @run main/othervm jdk.jfr.jvm.TestBeginAndEnd
  */
--- a/test/jdk/jdk/jfr/jvm/TestClassId.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestClassId.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,9 +31,10 @@
 import jdk.jfr.internal.JVM;
 import jdk.jfr.internal.Type;
 
-/*
+/**
  * @test TestClassId
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
  * @run main/othervm jdk.jfr.jvm.TestClassId
--- a/test/jdk/jdk/jfr/jvm/TestCounterTime.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestCounterTime.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,9 +29,10 @@
 
 import jdk.jfr.internal.JVM;
 
-/*
+/**
  * @test TestCounterTime
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
  * @run main/othervm jdk.jfr.jvm.TestCounterTime
--- a/test/jdk/jdk/jfr/jvm/TestCreateNative.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestCreateNative.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,10 +30,11 @@
 import jdk.jfr.Recording;
 import jdk.jfr.internal.JVM;
 
-/*
+/**
  * @test
  * @summary Checks that the JVM can rollback on native initialization failures.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
  * @run main/othervm jdk.jfr.jvm.TestCreateNative
--- a/test/jdk/jdk/jfr/jvm/TestDumpOnCrash.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestDumpOnCrash.java	Fri Jul 20 09:46:57 2018 +0200
@@ -36,10 +36,11 @@
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Verifies that data associated with a running recording can be evacuated to an hs_err_pidXXX.jfr when the VM crashes
+ * @requires vm.hasJFR
  *
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
--- a/test/jdk/jdk/jfr/jvm/TestGetAllEventClasses.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestGetAllEventClasses.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,9 +30,10 @@
 
 import java.util.List;
 
-/*
+/**
  * @test TestGetAllEventClasses
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @modules jdk.jfr/jdk.jfr.internal
  *
--- a/test/jdk/jdk/jfr/jvm/TestGetEventWriter.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestGetEventWriter.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,9 +30,10 @@
 import jdk.jfr.internal.EventWriter;
 import jdk.jfr.internal.JVM;
 
-/*
+/**
  * @test TestGetEventWriter
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
  *
--- a/test/jdk/jdk/jfr/jvm/TestGetStackTraceId.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestGetStackTraceId.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,9 +29,10 @@
 import jdk.jfr.internal.JVM;
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test TestGetStackTraceId
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
  * @run main/othervm jdk.jfr.jvm.TestGetStackTraceId
--- a/test/jdk/jdk/jfr/jvm/TestJFRIntrinsic.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestJFRIntrinsic.java	Fri Jul 20 09:46:57 2018 +0200
@@ -23,10 +23,11 @@
  * questions.
  */
 
-/*
+/**
  * @test
  * @summary Intrinsic for JFR
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  *
  * @modules jdk.jfr/jdk.jfr.internal
--- a/test/jdk/jdk/jfr/jvm/TestJavaEvent.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestJavaEvent.java	Fri Jul 20 09:46:57 2018 +0200
@@ -40,9 +40,10 @@
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.jfr.consumer.RecordingFile;
 
-/*
+/**
  * @test TestGetThreadId
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
  * @run main/othervm jdk.jfr.jvm.TestJavaEvent
--- a/test/jdk/jdk/jfr/jvm/TestJfrJavaBase.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestJfrJavaBase.java	Fri Jul 20 09:46:57 2018 +0200
@@ -23,11 +23,12 @@
  * questions.
  */
 
-/*
+/**
  * @test
  * @bug 8157032
  * @key jfr
  * @summary verify that jfr can not be used when JVM is executed only with java.base
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @run driver jdk.jfr.jvm.TestJfrJavaBase
--- a/test/jdk/jdk/jfr/jvm/TestLargeJavaEvent512k.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestLargeJavaEvent512k.java	Fri Jul 20 09:46:57 2018 +0200
@@ -43,9 +43,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.Stressor;
 
-/*
+/**
  * @test TestLargeJavaEvent512k
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
  *    java.base/jdk.internal.org.objectweb.asm
--- a/test/jdk/jdk/jfr/jvm/TestLargeJavaEvent64k.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestLargeJavaEvent64k.java	Fri Jul 20 09:46:57 2018 +0200
@@ -43,9 +43,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.Stressor;
 
-/*
+/**
  * @test TestLargeJavaEvent64k
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
  *    java.base/jdk.internal.org.objectweb.asm
--- a/test/jdk/jdk/jfr/jvm/TestLogImplementation.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestLogImplementation.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,9 +30,10 @@
 import jdk.jfr.internal.LogTag;
 import jdk.jfr.internal.LogLevel;
 
-/*
+/**
  * @test TestLogImplementation
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
  * @run main/othervm jdk.jfr.jvm.TestLogImplementation
--- a/test/jdk/jdk/jfr/jvm/TestLogOutput.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestLogOutput.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/*
+/**
  * @test TestLogOutput
  * @key jfr
  * @summary Sanity test jfr logging output
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm -Xlog:disable -Xlog:jfr*=trace:file=jfr_trace.txt -XX:StartFlightRecording=duration=1s,filename=recording.jfr jdk.jfr.jvm.TestLogOutput
  */
--- a/test/jdk/jdk/jfr/jvm/TestPid.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestPid.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,9 +29,10 @@
 
 import jdk.jfr.internal.JVM;
 
-/*
+/**
  * @test TestPid
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
  * @run main/othervm jdk.jfr.jvm.TestPid
--- a/test/jdk/jdk/jfr/jvm/TestUnloadEventClassCount.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestUnloadEventClassCount.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,10 +32,11 @@
 import jdk.jfr.FlightRecorder;
 import jdk.jfr.internal.JVM;
 
-/*
+/**
  * @test
  * @key jfr
  * @summary Unit test for JVM#getUnloadedEventClassCount
+ * @requires vm.hasJFR
  *
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
--- a/test/jdk/jdk/jfr/jvm/TestUnsupportedVM.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/jvm/TestUnsupportedVM.java	Fri Jul 20 09:46:57 2018 +0200
@@ -64,9 +64,10 @@
 import jdk.management.jfr.SettingDescriptorInfo;
 import jdk.test.lib.Utils;
 
-/*
+/**
  * @test TestUnsupportedVM
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @modules jdk.jfr
  *          jdk.management.jfr
--- a/test/jdk/jdk/jfr/startupargs/TestBadOptionValues.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestBadOptionValues.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,9 +29,10 @@
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @library /test/lib
  * @modules java.base/jdk.internal.misc
--- a/test/jdk/jdk/jfr/startupargs/TestDumpOnExit.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestDumpOnExit.java	Fri Jul 20 09:46:57 2018 +0200
@@ -38,10 +38,11 @@
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
-/*
+/**
  * @test
  * @summary Start a FlightRecording with dumponexit. Verify dump exists.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.startupargs.TestDumpOnExit
  */
--- a/test/jdk/jdk/jfr/startupargs/TestMemoryOptions.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestMemoryOptions.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,9 +33,10 @@
 import jdk.test.lib.process.ProcessTools;
 import jdk.internal.misc.Unsafe;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @modules jdk.jfr/jdk.jfr.internal
  *                 java.base/jdk.internal.misc
--- a/test/jdk/jdk/jfr/startupargs/TestMultipleStartupRecordings.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestMultipleStartupRecordings.java	Fri Jul 20 09:46:57 2018 +0200
@@ -29,9 +29,10 @@
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  *
  * @library /test/lib
  *
--- a/test/jdk/jdk/jfr/startupargs/TestOldObjectQueueSize.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestOldObjectQueueSize.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.jfr.EventNames;
 import jdk.test.lib.jfr.Events;
 
-/*
+/**
  * @test
  * @summary Test -XX:FlightRecorderOptions=old-object-queue-size
+ * @requires vm.hasJFR
  * @modules jdk.jfr/jdk.jfr.internal.test
  * @library /test/lib
  * @key jfr
--- a/test/jdk/jdk/jfr/startupargs/TestRepositoryPath.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestRepositoryPath.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Set repository path. Verify recording created in repo.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:StartFlightRecording=name=TestStartRecording,settings=profile -XX:FlightRecorderOptions=repository=./repo jdk.jfr.startupargs.TestRepositoryPath
  */
--- a/test/jdk/jdk/jfr/startupargs/TestRepositoryPathLong.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestRepositoryPathLong.java	Fri Jul 20 09:46:57 2018 +0200
@@ -31,10 +31,11 @@
 
 import jdk.test.lib.Asserts;
 
-/*
+/**
  * @test
  * @summary Set repository path. Verify recording created in repo.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:StartFlightRecording=name=myrec,settings=profile -XX:FlightRecorderOptions=repository=./subdirectory/subdirectory1/subdirectory2/subdirectory3/subdirectory4/subdirectory5/subdirectory6/subdirectory7/subdirectory8/subdirectory9/subdirectory10/subdirectory11/subdirectory12/subdirectory13/subdirectory14/subdirectory15 jdk.jfr.startupargs.TestRepositoryPathLong
  */
--- a/test/jdk/jdk/jfr/startupargs/TestRetransform.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestRetransform.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,9 +32,10 @@
 import jdk.test.lib.jfr.Events;
 import jdk.test.lib.jfr.SimpleEvent;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm -XX:FlightRecorderOptions=retransform=false jdk.jfr.startupargs.TestRetransform
  * @run main/othervm -XX:FlightRecorderOptions=retransform=true jdk.jfr.startupargs.TestRetransform
--- a/test/jdk/jdk/jfr/startupargs/TestRetransformUsingLog.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestRetransformUsingLog.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,9 +34,10 @@
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib
  * @run main/othervm jdk.jfr.startupargs.TestRetransformUsingLog
  */
--- a/test/jdk/jdk/jfr/startupargs/TestStartDelay.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestStartDelay.java	Fri Jul 20 09:46:57 2018 +0200
@@ -33,10 +33,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.CommonHelper;
 
-/*
+/**
  * @test
  * @summary Start a recording with delay. Verify recording starts later.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:StartFlightRecording=name=TestStartDelay,delay=5000s jdk.jfr.startupargs.TestStartDelay
  */
--- a/test/jdk/jdk/jfr/startupargs/TestStartDelayRunning.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestStartDelayRunning.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,10 +32,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.CommonHelper;
 
-/*
+/**
  * @test
  * @summary Verify that a recopding with a delay is started.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:StartFlightRecording=name=TestStartDelay,delay=1s jdk.jfr.startupargs.TestStartDelayRunning
  */
--- a/test/jdk/jdk/jfr/startupargs/TestStartDuration.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestStartDuration.java	Fri Jul 20 09:46:57 2018 +0200
@@ -34,10 +34,11 @@
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
-/*
+/**
  * @test
  * @summary Start a recording with duration. Verify recording stops.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main jdk.jfr.startupargs.TestStartDuration
  */
--- a/test/jdk/jdk/jfr/startupargs/TestStartMaxAgeSize.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestStartMaxAgeSize.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,10 +32,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.jfr.CommonHelper;
 
-/*
+/**
  * @test
  * @summary Start a recording with delay. Verify recording starts later.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:StartFlightRecording=name=TestStartMaxAgeSize,maxage=10s,maxsize=1000000 jdk.jfr.startupargs.TestStartMaxAgeSize
  */
--- a/test/jdk/jdk/jfr/startupargs/TestStartName.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestStartName.java	Fri Jul 20 09:46:57 2018 +0200
@@ -30,9 +30,10 @@
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
-/*
+/**
  * @test
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main jdk.jfr.startupargs.TestStartName
  */
--- a/test/jdk/jdk/jfr/startupargs/TestStartRecording.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jdk/jdk/jfr/startupargs/TestStartRecording.java	Fri Jul 20 09:46:57 2018 +0200
@@ -32,10 +32,11 @@
 import jdk.test.lib.Asserts;
 import jdk.test.lib.process.OutputAnalyzer;
 
-/*
+/**
  * @test
  * @summary Start a recording with -XX:StartFlightRecording. Dump recording with jcmd.
  * @key jfr
+ * @requires vm.hasJFR
  * @library /test/lib /test/jdk
  * @run main/othervm -XX:StartFlightRecording=name=TestStartRecording,settings=profile jdk.jfr.startupargs.TestStartRecording
  */
--- a/test/jtreg-ext/requires/VMProps.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/jtreg-ext/requires/VMProps.java	Fri Jul 20 09:46:57 2018 +0200
@@ -79,6 +79,9 @@
         // vm.hasSAandCanAttach is "true" if the VM contains the serviceability agent
         // and jhsdb and it can attach to the VM.
         map.put("vm.hasSAandCanAttach", vmHasSAandCanAttach());
+        // vm.hasJFR is "true" if JFR is included in the build of the VM and
+        // so tests can be executed.
+        map.put("vm.hasJFR", vmHasJFR());
         map.put("vm.cpu.features", cpuFeatures());
         map.put("vm.rtm.cpu", vmRTMCPU());
         map.put("vm.rtm.os", vmRTMOS());
@@ -288,6 +291,14 @@
     }
 
     /**
+     * @return "true" if the VM is compiled with Java Flight Recorder (JFR)
+     * support.
+     */
+    protected String vmHasJFR() {
+        return "" + WB.isJFRIncludedInVmBuild();
+    }
+
+    /**
      * @return true if VM runs RTM supported OS and false otherwise.
      */
     protected String vmRTMOS() {
--- a/test/lib/sun/hotspot/WhiteBox.java	Fri Jul 20 09:33:49 2018 +0200
+++ b/test/lib/sun/hotspot/WhiteBox.java	Fri Jul 20 09:46:57 2018 +0200
@@ -515,6 +515,7 @@
   public native boolean isSharedClass(Class<?> c);
   public native boolean areSharedStringsIgnored();
   public native boolean isCDSIncludedInVmBuild();
+  public native boolean isJFRIncludedInVmBuild();
   public native boolean isJavaHeapArchiveSupported();
   public native Object  getResolvedReferences(Class<?> c);
   public native boolean areOpenArchiveHeapObjectsMapped();