--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/jdk/jfr/startupargs/TestDumpOnExit.java	Tue May 15 20:24:34 2018 +0200
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2013, 2018, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.jfr.startupargs;
+
+import java.io.IOException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Iterator;
+import java.util.function.Supplier;
+
+import jdk.jfr.consumer.RecordingFile;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+/*
+ * @test
+ * @summary Start a FlightRecording with dumponexit. Verify dump exists.
+ * @key jfr
+ * @library /test/lib
+ * @run main/othervm jdk.jfr.startupargs.TestDumpOnExit
+ */
+public class TestDumpOnExit {
+
+    public static void main(String[] args) throws Exception {
+        Path dumpPath = Paths.get(".", "dumped.jfr");
+
+        // Test without security manager and a file name relative to current directory
+        testDumponExit(() -> dumpPath,
+                "-Xlog:jfr=trace",
+                "-XX:StartFlightRecording=filename=./dumped.jfr,dumponexit=true,settings=profile",
+                "jdk.jfr.startupargs.TestDumpOnExit$TestMain"
+        );
+        // Test with security manager and a file name relative to current directory
+        testDumponExit(() -> dumpPath,
+                "-Xlog:jfr=trace",
+                "-XX:StartFlightRecording=filename=./dumped.jfr,dumponexit=true,settings=profile",
+                "-Djava.security.manager",
+                "jdk.jfr.startupargs.TestDumpOnExit$TestMain"
+        );
+        // Test with security manager but without a name
+        testDumponExit(() -> findJFRFileInCurrentDirectory(),
+                "-Xlog:jfr=trace",
+                "-XX:StartFlightRecording=dumponexit=true,settings=profile",
+                "-Djava.security.manager",
+                "jdk.jfr.startupargs.TestDumpOnExit$TestMain"
+        );
+    }
+
+    private static Path findJFRFileInCurrentDirectory() {
+        try {
+            DirectoryStream<Path> ds = Files.newDirectoryStream(Paths.get("."), "*pid-*.jfr");
+            Iterator<Path> pathIterator = ds.iterator();
+            if (!pathIterator.hasNext()) {
+                throw new RuntimeException("Could not find jfr file in current directory");
+            }
+            return pathIterator.next();
+        } catch (IOException e) {
+            throw new RuntimeException("Could not list jfr file in current directory");
+        }
+    }
+
+    private static void testDumponExit(Supplier<Path> p,String... args) throws Exception, IOException {
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(true, args);
+        OutputAnalyzer output = ProcessTools.executeProcess(pb);
+        System.out.println(output.getOutput());
+        output.shouldHaveExitValue(0);
+        Path dump = p.get();
+        Asserts.assertTrue(Files.isRegularFile(dump), "No recording dumped " + dump);
+        System.out.println("Dumped recording size=" + Files.size(dump));
+        Asserts.assertFalse(RecordingFile.readAllEvents(dump).isEmpty(), "No events in dump");
+    }
+
+    @SuppressWarnings("unused")
+    private static class TestMain {
+        public static void main(String[] args) throws Exception {
+            System.out.println("Hello from test main");
+        }
+    }
+
+}