8203809: [Graal] JDI tests fail with: JDITestRuntimeException : ** event IS NOT a breakpoint **

Reviewed-by: sspitsyn, cjplummer
This commit is contained in:
Daniil Titov 2018-06-13 10:36:13 -07:00
parent f5f4f34a5b
commit b5eadc5721
10 changed files with 22 additions and 15 deletions

View File

@ -114,13 +114,6 @@ vmTestbase/nsk/jdi/stress/serial/heapwalking002/TestDescription.java
vmTestbase/nsk/jdi/stress/serial/mixed002/TestDescription.java 8203174 generic-all
vmTestbase/nsk/jdi/VMOutOfMemoryException/VMOutOfMemoryException001/VMOutOfMemoryException001.java 8203174 generic-all
vmTestbase/nsk/jdi/ClassPrepareRequest/addClassExclusionFilter/filter003/TestDescription.java 8203809 generic-all
vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_s/filter_s002/TestDescription.java 8203809 generic-all
vmTestbase/nsk/jdi/ClassPrepareRequest/addClassFilter_rt/filter_rt002/TestDescription.java 8203809 generic-all
vmTestbase/nsk/jdi/EventRequestManager/classPrepareRequests/clsprepreq002/TestDescription.java 8203809 generic-all
vmTestbase/nsk/jdi/EventRequestManager/methodEntryRequests/methentreq002/TestDescription.java 8203809 generic-all
vmTestbase/nsk/jdi/MethodEntryRequest/addClassExclusionFilter/filter002/TestDescription.java 8203809 generic-all
vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses026/TestDescription.java 8195627 generic-all
vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses028/TestDescription.java 8195627 generic-all
vmTestbase/nsk/jdi/VirtualMachine/redefineClasses/redefineclasses030/TestDescription.java 8195627 generic-all

View File

@ -494,7 +494,7 @@ public class filter003 {
log2(" received: " + event);
if (EventFilters.filtered(event)) {
if (EventFilters.filtered(event, debuggeeName)) {
eventSet.resume();
}
else {

View File

@ -501,7 +501,7 @@ public class filter_rt002 {
log2(" received: " + event);
if (EventFilters.filtered(event)) {
if (EventFilters.filtered(event, debuggeeName)) {
eventSet.resume();
}
else {

View File

@ -498,7 +498,7 @@ public class filter_s002 {
log2(" received: " + event);
if (EventFilters.filtered(event)) {
if (EventFilters.filtered(event, debuggeeName)) {
eventSet.resume();
}
else {

View File

@ -530,7 +530,7 @@ public class clsprepreq002 {
log2(" received: " + event);
if (EventFilters.filtered(event)) {
if (EventFilters.filtered(event, debuggeeName)) {
eventSet.resume();
}
else {

View File

@ -525,7 +525,7 @@ public class methentreq002 {
log2(" received: " + event);
if (EventFilters.filtered(event)) {
if (EventFilters.filtered(event, debuggeeName)) {
eventSet.resume();
}
else {

View File

@ -525,7 +525,7 @@ public class methexitreq002 {
log2(" received: " + event);
if (EventFilters.filtered(event)) {
if (EventFilters.filtered(event, debuggeeName)) {
eventSet.resume();
}
else {

View File

@ -495,7 +495,7 @@ public class filter002 {
log2(" received: " + event);
if (EventFilters.filtered(event)) {
if (EventFilters.filtered(event, debuggeeName)) {
eventSet.resume();
}
else {

View File

@ -495,7 +495,7 @@ public class filter002 {
log2(" received: " + event);
if (EventFilters.filtered(event)) {
if (EventFilters.filtered(event, debuggeeName)) {
eventSet.resume();
}
else {

View File

@ -339,4 +339,18 @@ public class EventFilters
return false;
}
// Filters out events with location not matching the given type.
public static boolean filtered(Event event, String typeName) {
if (event instanceof Locatable) {
Location location = ((Locatable) event).location();
if (location != null) {
ReferenceType declaringType = location.declaringType();
if (declaringType != null && typeName.equals(declaringType.name())) {
return false;
}
}
}
return true;
}
}