8191658: SA: Testcases for attach, detach, reattach and Jhisto commands

Reviewed-by: sspitsyn, jgeorge
This commit is contained in:
Sharath Ballal 2017-11-30 19:46:20 +05:30
parent 937799a84c
commit 0ac9a94c4d
3 changed files with 157 additions and 2 deletions

View File

@ -0,0 +1,77 @@
/*
* Copyright (c) 2017, 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;
/*
* @test
* @bug 8191658
* @summary Test clhsdb attach, detach, reattach commands
* @library /test/lib
* @run main/othervm ClhsdbAttach
*/
public class ClhsdbAttach {
public static void main(String[] args) throws Exception {
System.out.println("Starting ClhsdbAttach test");
LingeredApp theApp = null;
try {
ClhsdbLauncher test = new ClhsdbLauncher();
theApp = LingeredApp.startApp();
System.out.println("Started LingeredApp with pid " + theApp.getPid());
String attach = "attach " + theApp.getPid();
List<String> cmds = List.of(
"where",
attach,
"flags MaxJavaStackTraceDepth",
"detach",
"universe",
"reattach",
"longConstant markOopDesc::locked_value");
Map<String, List<String>> expStrMap = new HashMap<>();
expStrMap.put("where", List.of(
"Command not valid until attached to a VM"));
expStrMap.put("flags MaxJavaStackTraceDepth", List.of(
"MaxJavaStackTraceDepth = "));
expStrMap.put("universe", List.of(
"Command not valid until attached to a VM"));
expStrMap.put("longConstant markOopDesc::locked_value", List.of(
"longConstant markOopDesc::locked_value"));
test.run(-1, cmds, expStrMap, null);
} catch (Exception ex) {
throw new RuntimeException("Test ERROR " + ex, ex);
} finally {
LingeredApp.stopApp(theApp);
}
System.out.println("Test PASSED");
}
}

View File

@ -0,0 +1,76 @@
/*
* Copyright (c) 2017, 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.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import jdk.test.lib.apps.LingeredApp;
import jdk.test.lib.Utils;
/*
* @test
* @bug 8191658
* @summary Test clhsdb jhisto command
* @library /test/lib
* @run main/othervm ClhsdbJhisto
*/
public class ClhsdbJhisto {
public static void main(String[] args) throws Exception {
System.out.println("Starting ClhsdbJhisto test");
LingeredAppWithInterface theApp = null;
try {
ClhsdbLauncher test = new ClhsdbLauncher();
List<String> vmArgs = new ArrayList<String>();
vmArgs.addAll(Utils.getVmOptions());
theApp = new LingeredAppWithInterface();
LingeredApp.startApp(vmArgs, theApp);
System.out.println("Started LingeredApp with pid " + theApp.getPid());
List<String> cmds = List.of("jhisto");
Map<String, List<String>> expStrMap = new HashMap<>();
expStrMap.put("jhisto", List.of(
"java.lang.String",
"java.util.HashMap",
"java.lang.Class",
"java.nio.HeapByteBuffer",
"java.net.URI",
"LingeredAppWithInterface",
"ParselTongue",
"ImmutableCollections$SetN$1"));
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");
}
}

View File

@ -53,10 +53,12 @@ public class ClhsdbLauncher {
private void attach(long lingeredAppPid)
throws IOException {
System.out.println("Starting clhsdb against " + lingeredAppPid);
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jhsdb");
launcher.addToolArg("clhsdb");
launcher.addToolArg("--pid=" + Long.toString(lingeredAppPid));
if (lingeredAppPid != -1) {
launcher.addToolArg("--pid=" + Long.toString(lingeredAppPid));
System.out.println("Starting clhsdb against " + lingeredAppPid);
}
ProcessBuilder processBuilder = new ProcessBuilder(launcher.getCommand());
processBuilder.redirectError(ProcessBuilder.Redirect.INHERIT);