stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8134420: sun/tools/jps/TestJpsClass fails with java.lang.RuntimeException: The line 'line 2' does not match pattern '^\\d+\\s+.*': expected true, was false

Browse Source 
Reviewed-by: sla, dsamersoff
This commit is contained in:
Jaroslav Bachorik 2015-09-04 12:18:03 +02:00
parent 60cdefbf44
commit d9e40f6803
4 changed files with 12 additions and 8 deletions
jdk
src/jdk.jcmd/share/classes/sun/tools/jps
Jps.java
test
ProblemList.txt
sun/tools/jps
JpsBase.javaJpsHelper.java

8
jdk/src/jdk.jcmd/share/classes/sun/tools/jps/Jps.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2004, 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
@ -106,7 +106,11 @@ public class Jps {
errorString = " -- jvm args information unavailable";
String jvmArgs = MonitoredVmUtil.jvmArgs(vm);
if (jvmArgs != null && jvmArgs.length() > 0) {
output.append(' ').append(jvmArgs);
output.append(' ')
.append(
// multi-line args are permitted
jvmArgs.replace("\n", "\\n").replace("\r", "\\r")
);
}
}
if (arguments.showVmFlags()) {

5
jdk/test/ProblemList.txt

@ -387,11 +387,6 @@ sun/tools/jstatd/TestJstatdExternalRegistry.java generic-all
# 6456333
sun/tools/jps/TestJpsJarRelative.java generic-all
# 8134420
sun/tools/jps/TestJpsClass.java generic-all
sun/tools/jps/TestJpsJar.java generic-all
sun/tools/jps/TestJpsSanity.java generic-all
# 6734748
sun/tools/jinfo/JInfoRunningProcessFlagTest.java generic-all

2
jdk/test/sun/tools/jps/JpsBase.java

@ -138,6 +138,8 @@ public final class JpsBase {
String tmp = str.replace("\\", "\\\\");
tmp = tmp.replace("+", "\\+");
tmp = tmp.replace(".", "\\.");
tmp = tmp.replace("\n", "\\\\n");
tmp = tmp.replace("\r", "\\\\r");
return tmp;
}

5
jdk/test/sun/tools/jps/JpsHelper.java

@ -97,7 +97,10 @@ public final class JpsHelper {
* VM arguments to start test application with.
* -XX:+UsePerfData is required for running the tests on embedded platforms.
*/
public static final String[] VM_ARGS = {"-XX:+UsePerfData", "-Xmx512m", "-XX:+PrintGCDetails"};
public static final String[] VM_ARGS = {
"-XX:+UsePerfData", "-Xmx512m", "-XX:+PrintGCDetails",
"-Dmultiline.prop=value1\nvalue2\r\nvalue3"
};
/**
* VM flag to start test application with
*/