8024985: com/sun/jdi/StepTest.java failed since jdk8b107

Reviewed-by: dcubed
This commit is contained in:
Staffan Larsen 2013-09-20 10:14:35 +02:00
parent 0f59d418d8
commit 6de8695342
6 changed files with 29 additions and 4 deletions

View File

@ -417,8 +417,12 @@ public class ExceptionEvents extends TestScaffold {
request = eventRequestManager().createExceptionRequest(exceptionClass,
caught, uncaught);
request.addClassExclusionFilter("java.*");
request.addClassExclusionFilter("javax.*");
request.addClassExclusionFilter("sun.*");
request.addClassExclusionFilter("com.sun.*");
request.addClassExclusionFilter("com.oracle.*");
request.addClassExclusionFilter("oracle.*");
request.addClassExclusionFilter("jdk.internal.*");
request.setSuspendPolicy(suspendPolicy);
request.enable();

View File

@ -121,9 +121,13 @@ public class FilterNoMatch extends JDIScaffold {
// We have to filter out all these so that they don't cause the
// listener to be called.
request1.addClassExclusionFilter( "java.*");
request1.addClassExclusionFilter( "com.*");
request1.addClassExclusionFilter( "sun.*");
request1.addClassExclusionFilter("java.*");
request1.addClassExclusionFilter("javax.*");
request1.addClassExclusionFilter("sun.*");
request1.addClassExclusionFilter("com.sun.*");
request1.addClassExclusionFilter("com.oracle.*");
request1.addClassExclusionFilter("oracle.*");
request1.addClassExclusionFilter("jdk.internal.*");
// We want our listener to be called if a pattern does not match.
// So, here we want patterns that do not match HelloWorld.

View File

@ -450,8 +450,12 @@ abstract public class JDIScaffold {
requestManager.createStepRequest(thread, gran, depth);
sr.addClassExclusionFilter("java.*");
sr.addClassExclusionFilter("javax.*");
sr.addClassExclusionFilter("sun.*");
sr.addClassExclusionFilter("com.sun.*");
sr.addClassExclusionFilter("com.oracle.*");
sr.addClassExclusionFilter("oracle.*");
sr.addClassExclusionFilter("jdk.internal.*");
sr.addCountFilter(1);
sr.enable();
StepEvent retEvent = (StepEvent)waitForRequestedEvent(sr);

View File

@ -130,8 +130,12 @@ public class PopAndStepTest extends TestScaffold {
StepRequest srInto = erm.createStepRequest(mainThread, StepRequest.STEP_LINE,
StepRequest.STEP_INTO);
srInto.addClassExclusionFilter("java.*");
srInto.addClassExclusionFilter("javax.*");
srInto.addClassExclusionFilter("sun.*");
srInto.addClassExclusionFilter("com.sun.*");
srInto.addClassExclusionFilter("com.oracle.*");
srInto.addClassExclusionFilter("oracle.*");
srInto.addClassExclusionFilter("jdk.internal.*");
srInto.addCountFilter(1);
srInto.enable(); // This fails
mainThread.popFrames(frameFor("A"));

View File

@ -75,8 +75,12 @@ public class RepStep {
DEPTH);
sr.addClassExclusionFilter("java.*");
sr.addClassExclusionFilter("javax.*");
sr.addClassExclusionFilter("sun.*");
sr.addClassExclusionFilter("com.sun.*");
sr.addClassExclusionFilter("com.oracle.*");
sr.addClassExclusionFilter("oracle.*");
sr.addClassExclusionFilter("jdk.internal.*");
sr.enable();
}

View File

@ -746,8 +746,12 @@ abstract public class TestScaffold extends TargetAdapter {
requestManager.createStepRequest(thread, gran, depth);
sr.addClassExclusionFilter("java.*");
sr.addClassExclusionFilter("javax.*");
sr.addClassExclusionFilter("sun.*");
sr.addClassExclusionFilter("com.sun.*");
sr.addClassExclusionFilter("com.oracle.*");
sr.addClassExclusionFilter("oracle.*");
sr.addClassExclusionFilter("jdk.internal.*");
sr.addCountFilter(1);
sr.enable();
StepEvent retEvent = (StepEvent)waitForRequestedEvent(sr);
@ -829,7 +833,8 @@ abstract public class TestScaffold extends TargetAdapter {
Method method = findMethod(rt, methodName, methodSignature);
if (method == null) {
throw new IllegalArgumentException("Bad method name/signature");
throw new IllegalArgumentException("Bad method name/signature: "
+ clsName + "." + methodName + ":" + methodSignature);
}
return resumeTo(method.location());