--- a/test/jdk/lib/testlibrary/jdk/testlibrary/JcmdBase.java	Mon Aug 27 16:45:18 2018 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2013, 2015, 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.
- *
- * 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.testlibrary;
-
-import java.util.Arrays;
-
-/**
- * Helper class for starting jcmd process.
- * <pre>
- * - jcmd will send diagnostic requests to the current java process:
- *      jcmd pid_to_current_process PerfCounter.print
- * - jcmd will be run without sending request to any JVM
- *      jcmd -h
- * </pre>
- */
-public final class JcmdBase {
-
-    private static ProcessBuilder processBuilder = new ProcessBuilder();
-
-    private JcmdBase() {
-        // Private constructor to prevent class instantiation
-    }
-
-    /**
-     * Sends the diagnostic command request to the current process
-     *
-     * @see #jcmd(boolean, String[], String[])
-     */
-    public final static OutputAnalyzer jcmd(String... jcmdArgs)
-            throws Exception {
-        return jcmd(true, null, jcmdArgs);
-    }
-
-    /**
-     * Sends the diagnostic command request to the current process.
-     * jcmd will be run with specified {@code vmArgs}.
-     *
-     * @see #jcmd(boolean, String[], String[])
-     */
-    public final static OutputAnalyzer jcmd(String[] vmArgs,
-            String[] jcmdArgs) throws Exception {
-        return jcmd(true, vmArgs, jcmdArgs);
-    }
-
-    /**
-     * Runs jcmd without sending request to any JVM
-     *
-     * @see #jcmd(boolean, String[], String[])
-     */
-    public final static OutputAnalyzer jcmdNoPid(String[] vmArgs,
-            String[] jcmdArgs) throws Exception {
-        return jcmd(false, vmArgs, jcmdArgs);
-    }
-
-    /**
-     * If {@code requestToCurrentProcess} is {@code true}
-     * sends a diagnostic command request to the current process.
-     * If {@code requestToCurrentProcess} is {@code false}
-     * runs jcmd without sending request to any JVM.
-     *
-     * @param requestToCurrentProcess
-     *            Defines if jcmd will send request to the current process
-     * @param vmArgs
-     *            jcmd will be run with VM arguments specified,
-     *            e.g. -XX:+UsePerfData
-     * @param jcmdArgs
-     *            jcmd will be run with option or command and its arguments
-     *            specified, e.g. VM.flags
-     * @return The output from {@link OutputAnalyzer} object
-     * @throws Exception
-     */
-    private static final OutputAnalyzer jcmd(boolean requestToCurrentProcess,
-            String[] vmArgs, String[] jcmdArgs) throws Exception {
-        JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jcmd");
-        if (vmArgs != null) {
-            for (String vmArg : vmArgs) {
-                launcher.addVMArg(vmArg);
-            }
-        }
-        if (requestToCurrentProcess) {
-            launcher.addToolArg(Long.toString(ProcessTools.getProcessId()));
-        }
-        if (jcmdArgs != null) {
-            for (String toolArg : jcmdArgs) {
-                launcher.addToolArg(toolArg);
-            }
-        }
-        processBuilder.command(launcher.getCommand());
-        System.out.println(Arrays.toString(processBuilder.command().toArray()).replace(",", ""));
-        OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);
-        System.out.println(output.getOutput());
-
-        return output;
-    }
-
-}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/sun/tools/jcmd/JcmdBase.java	Mon Aug 27 17:01:15 2018 -0700
@@ -0,0 +1,119 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+
+import java.util.Arrays;
+
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.JDKToolLauncher;
+
+/**
+ * Helper class for starting jcmd process.
+ * <pre>
+ * - jcmd will send diagnostic requests to the current java process:
+ *      jcmd pid_to_current_process PerfCounter.print
+ * - jcmd will be run without sending request to any JVM
+ *      jcmd -h
+ * </pre>
+ */
+public final class JcmdBase {
+
+    private static ProcessBuilder processBuilder = new ProcessBuilder();
+
+    private JcmdBase() {
+        // Private constructor to prevent class instantiation
+    }
+
+    /**
+     * Sends the diagnostic command request to the current process
+     *
+     * @see #jcmd(boolean, String[], String[])
+     */
+    public final static OutputAnalyzer jcmd(String... jcmdArgs)
+            throws Exception {
+        return jcmd(true, null, jcmdArgs);
+    }
+
+    /**
+     * Sends the diagnostic command request to the current process.
+     * jcmd will be run with specified {@code vmArgs}.
+     *
+     * @see #jcmd(boolean, String[], String[])
+     */
+    public final static OutputAnalyzer jcmd(String[] vmArgs,
+            String[] jcmdArgs) throws Exception {
+        return jcmd(true, vmArgs, jcmdArgs);
+    }
+
+    /**
+     * Runs jcmd without sending request to any JVM
+     *
+     * @see #jcmd(boolean, String[], String[])
+     */
+    public final static OutputAnalyzer jcmdNoPid(String[] vmArgs,
+            String[] jcmdArgs) throws Exception {
+        return jcmd(false, vmArgs, jcmdArgs);
+    }
+
+    /**
+     * If {@code requestToCurrentProcess} is {@code true}
+     * sends a diagnostic command request to the current process.
+     * If {@code requestToCurrentProcess} is {@code false}
+     * runs jcmd without sending request to any JVM.
+     *
+     * @param requestToCurrentProcess
+     *            Defines if jcmd will send request to the current process
+     * @param vmArgs
+     *            jcmd will be run with VM arguments specified,
+     *            e.g. -XX:+UsePerfData
+     * @param jcmdArgs
+     *            jcmd will be run with option or command and its arguments
+     *            specified, e.g. VM.flags
+     * @return The output from {@link OutputAnalyzer} object
+     * @throws Exception
+     */
+    private static final OutputAnalyzer jcmd(boolean requestToCurrentProcess,
+            String[] vmArgs, String[] jcmdArgs) throws Exception {
+        JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jcmd");
+        if (vmArgs != null) {
+            for (String vmArg : vmArgs) {
+                launcher.addVMArg(vmArg);
+            }
+        }
+        if (requestToCurrentProcess) {
+            launcher.addToolArg(Long.toString(ProcessTools.getProcessId()));
+        }
+        if (jcmdArgs != null) {
+            for (String toolArg : jcmdArgs) {
+                launcher.addToolArg(toolArg);
+            }
+        }
+        processBuilder.command(launcher.getCommand());
+        System.out.println(Arrays.toString(processBuilder.command().toArray()).replace(",", ""));
+        OutputAnalyzer output = ProcessTools.executeProcess(processBuilder);
+        System.out.println(output.getOutput());
+
+        return output;
+    }
+
+}

--- a/test/jdk/sun/tools/jcmd/TestJcmdDefaults.java	Mon Aug 27 16:45:18 2018 -0700
+++ b/test/jdk/sun/tools/jcmd/TestJcmdDefaults.java	Mon Aug 27 17:01:15 2018 -0700
@@ -30,7 +30,6 @@
 import java.nio.file.Paths;
 import java.util.List;
 
-import jdk.testlibrary.JcmdBase;
 import jdk.testlibrary.OutputAnalyzer;
 import jdk.testlibrary.Utils;
 

--- a/test/jdk/sun/tools/jcmd/TestJcmdSanity.java	Mon Aug 27 16:45:18 2018 -0700
+++ b/test/jdk/sun/tools/jcmd/TestJcmdSanity.java	Mon Aug 27 17:01:15 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 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
@@ -30,7 +30,6 @@
 import java.nio.file.Paths;
 import java.util.List;
 
-import jdk.testlibrary.JcmdBase;
 import jdk.testlibrary.OutputAnalyzer;
 import jdk.testlibrary.ProcessTools;
 import jdk.testlibrary.Utils;