diff -r 2c3cc4b01880 -r c16ac7a2eba4 test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java --- a/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java Wed Oct 30 16:14:56 2019 +0100 +++ b/test/jdk/jdk/jfr/event/metadata/TestLookForUntestedEvents.java Wed Oct 30 19:43:52 2019 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -81,6 +81,13 @@ Arrays.asList("DumpReason") ); + // Experimental events + private static final Set experimentalEvents = new HashSet<>( + Arrays.asList( + "Flush", "FlushStorage", "FlushStacktrace", + "FlushStringPool", "FlushMetadata", "FlushTypeSet") + ); + public static void main(String[] args) throws Exception { for (EventType type : FlightRecorder.getFlightRecorder().getEventTypes()) { @@ -138,6 +145,10 @@ } } + // remove experimental events from eventsFromEventNamesClass since jfrEventTypes + // excludes experimental events + eventsFromEventNamesClass.removeAll(experimentalEvents); + if (!jfrEventTypes.equals(eventsFromEventNamesClass)) { String exceptionMsg = "Events declared in jdk.test.lib.jfr.EventNames differ " + "from events returned by FlightRecorder.getEventTypes()";