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

8195703: BasicJDWPConnectionTest.java: 'App exited unexpectedly with 2'

Browse Source 
Reviewed-by: sspitsyn, jcbeyler
This commit is contained in:
Alex Menkov 2018-10-12 10:08:11 -07:00
parent cbe11130f5
commit 24fb839864
4 changed files with 53 additions and 48 deletions

2
test/jdk/ProblemList.txt

@ -835,8 +835,6 @@ tools/pack200/CommandLineTests.java 8059906 generic-
# jdk_jdi
com/sun/jdi/BasicJDWPConnectionTest.java 8195703 generic-all
com/sun/jdi/RepStep.java 8043571 generic-all
com/sun/jdi/sde/SourceDebugExtensionTest.java 8158066 windows-all

83
test/jdk/com/sun/jdi/BasicJDWPConnectionTest.java

@ -29,17 +29,15 @@
*/
import java.io.IOException;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.net.Socket;
import java.net.SocketException;
import jdk.test.lib.apps.LingeredApp;
import jdk.test.lib.Utils;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class BasicJDWPConnectionTest {
@ -64,25 +62,37 @@ public class BasicJDWPConnectionTest {
return res;
}
public static ArrayList<String> prepareCmd(int port, String allowOpt) {
String address = "*:" + String.valueOf(port);
public static ArrayList<String> prepareCmd(String allowOpt) {
ArrayList<String> cmd = new ArrayList<>();
String jdwpArgs = "-agentlib:jdwp=transport=dt_socket,server=y," +
"suspend=n,address=" + address + allowOpt;
"suspend=n,address=*:0" + allowOpt;
cmd.add(jdwpArgs);
return cmd;
}
private static Pattern listenRegexp = Pattern.compile("Listening for transport \\b(.+)\\b at address: \\b(\\d+)\\b");
private static int detectPort(String s) {
Matcher m = listenRegexp.matcher(s);
if (!m.find()) {
throw new RuntimeException("Could not detect port from '" + s + "'");
}
// m.group(1) is transport, m.group(2) is port
return Integer.parseInt(m.group(2));
}
public static void positiveTest(String testName, String allowOpt)
throws InterruptedException, IOException {
System.err.println("\nStarting " + testName);
int port = Utils.getFreePort();
ArrayList<String> cmd = prepareCmd(port, allowOpt);
ArrayList<String> cmd = prepareCmd(allowOpt);
LingeredApp a = LingeredApp.startApp(cmd);
int res = handshake(port);
a.stopApp();
int res;
try {
res = handshake(detectPort(a.getProcessStdout()));
} finally {
a.stopApp();
}
if (res < 0) {
throw new RuntimeException(testName + " FAILED");
}
@ -92,12 +102,15 @@ public class BasicJDWPConnectionTest {
public static void negativeTest(String testName, String allowOpt)
throws InterruptedException, IOException {
System.err.println("\nStarting " + testName);
int port = Utils.getFreePort();
ArrayList<String> cmd = prepareCmd(port, allowOpt);
ArrayList<String> cmd = prepareCmd(allowOpt);
LingeredApp a = LingeredApp.startApp(cmd);
int res = handshake(port);
a.stopApp();
int res;
try {
res = handshake(detectPort(a.getProcessStdout()));
} finally {
a.stopApp();
}
if (res > 0) {
System.err.println(testName + ": res=" + res);
throw new RuntimeException(testName + " FAILED");
@ -109,16 +122,18 @@ public class BasicJDWPConnectionTest {
public static void badAllowOptionTest(String testName, String allowOpt)
throws InterruptedException, IOException {
System.err.println("\nStarting " + testName);
int port = Utils.getFreePort();
ArrayList<String> cmd = prepareCmd(port, allowOpt);
ArrayList<String> cmd = prepareCmd(allowOpt);
LingeredApp a;
try {
LingeredApp a = LingeredApp.startApp(cmd);
a = LingeredApp.startApp(cmd);
} catch (IOException ex) {
System.err.println(testName + ": caught expected IOException");
System.err.println(testName + " PASSED");
return;
}
// LingeredApp.startApp is expected to fail, but if not, terminate the app
a.stopApp();
throw new RuntimeException(testName + " FAILED");
}
@ -174,26 +189,16 @@ public class BasicJDWPConnectionTest {
badAllowOptionTest("ExplicitMultiDefault2Test", allowOpt);
}
public static void main(String[] args) {
try {
DefaultTest();
ExplicitDefaultTest();
AllowTest();
MultiAllowTest();
DenyTest();
MultiDenyTest();
EmptyAllowOptionTest();
ExplicitMultiDefault1Test();
ExplicitMultiDefault2Test();
System.err.println("\nTest PASSED");
} catch (InterruptedException ex) {
System.err.println("\nTest ERROR, getFreePort");
ex.printStackTrace();
System.exit(3);
} catch (IOException ex) {
System.err.println("\nTest ERROR");
ex.printStackTrace();
System.exit(3);
}
public static void main(String[] args) throws Exception {
DefaultTest();
ExplicitDefaultTest();
AllowTest();
MultiAllowTest();
DenyTest();
MultiDenyTest();
EmptyAllowOptionTest();
ExplicitMultiDefault1Test();
ExplicitMultiDefault2Test();
System.err.println("\nTest PASSED");
}
}

4
test/jdk/com/sun/jdi/DoubleAgentTest.java

@ -41,10 +41,8 @@ public class DoubleAgentTest {
"test.classes", ".");
public static void main(String[] args) throws Throwable {
int port = Utils.getFreePort();
String jdwpOption = "-agentlib:jdwp=transport=dt_socket"
+ ",server=y" + ",suspend=n" + ",address=*:" + String.valueOf(port);
+ ",server=y" + ",suspend=n" + ",address=*:0";
OutputAnalyzer output = ProcessTools.executeTestJvm("-classpath",
TEST_CLASSES,

12
test/lib/jdk/test/lib/apps/LingeredApp.java

@ -26,9 +26,6 @@ package jdk.test.lib.apps;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.StringReader;
import java.nio.file.Files;
import java.nio.file.NoSuchFileException;
@ -43,7 +40,6 @@ import java.util.Map;
import java.util.stream.Collectors;
import java.util.UUID;
import jdk.test.lib.process.OutputBuffer;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.StreamPumper;
/**
@ -136,6 +132,14 @@ public class LingeredApp {
return appProcess;
}
/**
* @return the LingeredApp's output.
* Can be called after the app is run.
*/
public String getProcessStdout() {
return stdoutBuffer.toString();
}
/**
*
* @return OutputBuffer object for the LingeredApp's output. Can only be called