--- a/test/hotspot/jtreg/runtime/SharedArchiveFile/SASymbolTableTest.java	Tue Jul 03 15:08:01 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2016, 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.
- */
-
-/**
- * @test SASymbolTableTest
- * @summary Walk symbol table using SA, with and without CDS.
- * @requires vm.cds & vm.hasSAandCanAttach
- * @library /test/lib
- * @modules java.base/jdk.internal.misc
- *          jdk.hotspot.agent/sun.jvm.hotspot.oops
- *          jdk.hotspot.agent/sun.jvm.hotspot.memory
- *          jdk.hotspot.agent/sun.jvm.hotspot.runtime
- *          jdk.hotspot.agent/sun.jvm.hotspot.tools
- *          java.management
- * @build SASymbolTableTestAgent
- * @run main SASymbolTableTest
- */
-
-import java.util.Arrays;
-import java.util.List;
-import jdk.test.lib.cds.CDSTestUtils;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.Platform;
-import jdk.test.lib.apps.LingeredApp;
-
-/*
- * The purpose of this test is to validate that we can use SA to
- * attach a process and walk its SymbolTable, regardless whether
- * the attachee process runs in CDS mode or not.
- *
- * SASymbolTableTest Just sets up the agent and attachee processes.
- * The SymbolTable walking is done in the SASymbolTableTestAgent class.
- */
-public class SASymbolTableTest {
-    static String jsaName = "./SASymbolTableTest.jsa";
-    private static LingeredApp theApp = null;
-
-
-    public static void main(String[] args) throws Exception {
-        CDSTestUtils.createArchiveAndCheck();
-        run(true);
-        run(false);
-    }
-
-
-    private static void run(boolean useArchive) throws Exception {
-        String flag = useArchive ? "auto" : "off";
-
-        try {
-            // (1) Launch the attachee process
-            System.out.println("Starting LingeredApp");
-            List<String> vmOpts = Arrays.asList(
-                    "-XX:SharedArchiveFile=" + jsaName,
-                    "-Xshare:" + flag,
-                    "-showversion");                // so we can see "sharing" in the output
-
-            theApp = LingeredApp.startApp(vmOpts);
-
-            // (2) Launch the agent process
-            long pid = theApp.getPid();
-            System.out.println("Attaching agent to " + pid );
-            ProcessBuilder tool = ProcessTools.createJavaProcessBuilder(
-                    "--add-modules=jdk.hotspot.agent",
-                    "--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.oops=ALL-UNNAMED",
-                    "--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.memory=ALL-UNNAMED",
-                    "--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.runtime=ALL-UNNAMED",
-                    "--add-exports=jdk.hotspot.agent/sun.jvm.hotspot.tools=ALL-UNNAMED",
-                    "SASymbolTableTestAgent",
-                    Long.toString(pid));
-            OutputAnalyzer output = CDSTestUtils.executeAndLog(tool, "tool");
-            if (output.getStdout().contains("connected too early")) {
-                System.out.println("SymbolTable not created by VM - test skipped");
-                return;
-            }
-            output.shouldHaveExitValue(0);
-        } catch (Exception ex) {
-            throw new RuntimeException("Test ERROR " + ex, ex);
-        } finally {
-            LingeredApp.stopApp(theApp);
-        }
-    }
-}

--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbol.java	Tue Jul 03 15:08:01 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 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.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import jdk.test.lib.apps.LingeredApp;
-import jdk.test.lib.Platform;
-
-/**
- * @test
- * @bug 8190198
- * @summary Test clhsdb symboldump command
- * @requires vm.hasSA
- * @library /test/lib
- * @run main/othervm ClhsdbSymbol
- */
-
-public class ClhsdbSymbol {
-
-    public static void main(String[] args) throws Exception {
-        System.out.println("Starting ClhsdbSymbol test");
-
-        LingeredApp theApp = null;
-        try {
-            ClhsdbLauncher test = new ClhsdbLauncher();
-            theApp = LingeredApp.startApp();
-            System.out.println("Started LingeredApp with pid " + theApp.getPid());
-
-            List<String> cmds = List.of("symboldump");
-
-            Map<String, List<String>> expStrMap = new HashMap<>();
-            expStrMap.put("symboldump", List.of(
-                    "java/lang/String", "java/util/HashMap",
-                    "Ljava/io/InputStream", "LambdaMetafactory", "PerfCounter",
-                    "isAnonymousClass", "JVMTI_THREAD_STATE_TERMINATED", "jdi",
-                    "checkGetClassLoaderPermission", "lockCreationTime",
-                    "stderrBuffer", "stdoutBuffer", "getProcess",
-                    "LingeredApp"));
-
-            test.run(theApp.getPid(), cmds, expStrMap, null);
-        } catch (Exception ex) {
-            throw new RuntimeException("Test ERROR " + ex, ex);
-        } finally {
-            LingeredApp.stopApp(theApp);
-        }
-        System.out.println("Test PASSED");
-    }
-}

--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbSymbolTable.java	Tue Jul 03 15:08:01 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2017, 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.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.ArrayList;
-import jdk.test.lib.apps.LingeredApp;
-
-/**
- * @test
- * @bug 8191538
- * @summary Test the clhsdb 'symboltable' and 'symbol' commands
- * @requires vm.hasSA
- * @library /test/lib
- * @run main/othervm ClhsdbSymbolTable
- */
-
-public class ClhsdbSymbolTable {
-
-    public static void main(String[] args) throws Exception {
-        System.out.println("Starting the ClhsdbSymbolTable test");
-
-        LingeredApp theApp = null;
-        try {
-            ClhsdbLauncher test = new ClhsdbLauncher();
-
-            theApp = LingeredApp.startApp();
-            System.out.println("Started LingeredApp with pid " + theApp.getPid());
-
-            // Test the symboltable command
-            List<String> cmds = List.of(
-                "symboltable main",
-                "symboltable java/lang/Class",
-                "symboltable java/lang/Object",
-                "symboltable java/lang/String",
-                "symboltable java/util/List",
-                "symboltable jdk/test/lib/apps/LingeredApp");
-
-            Map<String, List<String>> expStrMap = new HashMap<>();
-            expStrMap.put("symboltable main", List.of(
-                "sun.jvm.hotspot.oops.Symbol@"));
-            expStrMap.put("symboltable java/lang/Class", List.of(
-                "sun.jvm.hotspot.oops.Symbol@"));
-            expStrMap.put("symboltable java/lang/Object", List.of(
-                "sun.jvm.hotspot.oops.Symbol@"));
-            expStrMap.put("symboltable java/lang/String", List.of(
-                "sun.jvm.hotspot.oops.Symbol@"));
-            expStrMap.put("symboltable java/util/List", List.of(
-                "sun.jvm.hotspot.oops.Symbol@"));
-            expStrMap.put("symboltable jdk/test/lib/apps/LingeredApp", List.of(
-                "sun.jvm.hotspot.oops.Symbol@"));
-            String consolidatedOutput =
-                test.run(theApp.getPid(), cmds, expStrMap, null);
-
-            // Test the 'symbol' command passing in the address obtained from
-            // the 'symboltable' command
-            expStrMap = new HashMap<>();
-            cmds = new ArrayList<String>();
-            int expectedStringsIdx = 0;
-            String expectedStrings[] = {"#main",
-                                        "#java/lang/Class", "#java/lang/Object",
-                                        "#java/lang/String", "#java/util/List",
-                                        "#jdk/test/lib/apps/LingeredApp"};
-            if (consolidatedOutput != null) {
-                // Output could be null due to attach permission issues
-                // and if we are skipping this.
-                String[] singleCommandOutputs = consolidatedOutput.split("hsdb>");
-
-                for (String singleCommandOutput : singleCommandOutputs) {
-                    if (singleCommandOutput.contains("@")) {
-                        String[] tokens = singleCommandOutput.split("@");
-                        String addressString = tokens[1].replace("\n","");
-
-                        // tokens[1] represents the address of the symbol
-                        String cmd = "symbol " + addressString;
-                        cmds.add(cmd);
-                        expStrMap.put(cmd, List.of
-                            (expectedStrings[expectedStringsIdx++]));
-                    }
-                }
-                test.run(theApp.getPid(), cmds, expStrMap, null);
-            }
-        } catch (Exception ex) {
-            throw new RuntimeException("Test ERROR " + ex, ex);
-        } finally {
-            LingeredApp.stopApp(theApp);
-        }
-        System.out.println("Test PASSED");
-    }
-}

--- a/test/jdk/sun/tools/jhsdb/AlternateHashingTest.java	Tue Jul 03 15:08:01 2018 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2017, 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.
- */
-
-/**
- * @test
- * @bug 8030750
- * @summary Test alternate hashing of strings in Serviceability Agent.
- * @requires vm.hasSAandCanAttach
- * @library /test/lib
- * @library /lib/testlibrary
- * @compile AlternateHashingTest.java
- * @run main/timeout=240 AlternateHashingTest
- */
-
-import java.io.BufferedReader;
-import java.io.OutputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.util.Arrays;
-import jdk.testlibrary.JDKToolLauncher;
-import jdk.test.lib.apps.LingeredApp;
-import jdk.test.lib.Platform;
-
-public class AlternateHashingTest {
-
-    private static LingeredAppWithAltHashing theApp = null;
-
-    /**
-     *
-     * @param vmArgs  - tool arguments to launch jhsdb
-     * @return exit code of tool
-     */
-    public static void launch(String expectedMessage, String cmd) throws IOException {
-
-        System.out.println("Starting LingeredApp");
-        try {
-            theApp = new LingeredAppWithAltHashing();
-            LingeredApp.startApp(Arrays.asList("-Xmx256m"), theApp);
-
-            System.out.println("Starting clhsdb against " + theApp.getPid());
-            JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jhsdb");
-            launcher.addToolArg("clhsdb");
-            launcher.addToolArg("--pid=" + Long.toString(theApp.getPid()));
-
-            ProcessBuilder processBuilder = new ProcessBuilder(launcher.getCommand());
-            processBuilder.redirectError(ProcessBuilder.Redirect.INHERIT);
-            Process toolProcess = processBuilder.start();
-
-            try (OutputStream out = toolProcess.getOutputStream()) {
-                out.write(cmd.getBytes());
-                out.write("quit\n".getBytes());
-            }
-
-            boolean result = false;
-            try (BufferedReader reader =
-                 new BufferedReader(new InputStreamReader(toolProcess.getInputStream()))) {
-                String line;
-
-                while ((line = reader.readLine()) != null) {
-                    line = line.trim();
-                    System.out.println(line);
-
-                    if (line.contains(expectedMessage)) {
-                        result = true;
-                        break;
-                    }
-                }
-            }
-
-            toolProcess.waitFor();
-
-            if (toolProcess.exitValue() != 0) {
-                throw new RuntimeException("FAILED CLHSDB terminated with non-zero exit code " + toolProcess.exitValue());
-            }
-
-            if (!result) {
-                throw new RuntimeException(cmd + " command output is missing the message " + expectedMessage);
-            }
-
-        } catch (Exception ex) {
-            throw new RuntimeException("Test ERROR " + ex, ex);
-        } finally {
-            LingeredApp.stopApp(theApp);
-        }
-    }
-
-
-    public static void testAltHashing() throws IOException {
-
-        launch("Stack in use by Java", "threads\n");
-    }
-
-    public static void main(String[] args) throws Exception {
-
-        testAltHashing();
-
-        // The test throws RuntimeException on error.
-        // IOException is thrown if LingeredApp can't start because of some bad
-        // environment condition
-        System.out.println("Test PASSED");
-    }
-}