8244537: JDI tests fail due to "ERROR: Exception : nsk.share.jdi.JDITestRuntimeException: JDITestRuntimeException : ** event IS NOT a breakpoint **"
Reviewed-by: sspitsyn, amenkov
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java
index b7ca96d..1eeae0e 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/addCountFilter/addcountfilter001.java
@@ -398,6 +398,7 @@
log3("ERROR: IllegalArgumentException");
}
+ vm.suspend();
try {
log2("......eventRequest1.enable();");
eventRequest1.enable();
@@ -419,6 +420,7 @@
} catch ( InvalidRequestStateException e ) {
log2(" InvalidRequestStateException");
}
+ vm.resume();
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java
index 6b1a8b1..566f634 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/disable/disable001.java
@@ -411,6 +411,7 @@
throw new JDITestRuntimeException("** default case 2 **");
}
+ vm.suspend();
log2("......eventRequest1.setEnabled(true);");
eventRequest1.setEnabled(true);
@@ -423,6 +424,7 @@
log3("ERROR: EventRequest is still enabled");
}
eventRequest1.setEnabled(false);
+ vm.resume();
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java
index c374cfd..c93d793 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/enable/enable001.java
@@ -363,6 +363,7 @@
throw new JDITestRuntimeException("** default case 2 **");
}
+ vm.suspend();
log2("......eventRequest1.enable();");
eventRequest1.enable();
log2(" checking up on eventRequest1");
@@ -371,6 +372,7 @@
log3("ERROR: EventRequest is not enabled");
}
eventRequest1.disable();
+ vm.resume();
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java
index 1728351..e0ba70c 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/isEnabled/isenabled001.java
@@ -364,6 +364,7 @@
throw new JDITestRuntimeException("** default case 2 **");
}
+ vm.suspend();
log2("......eventRequest1.setEnabled(true);");
eventRequest1.setEnabled(true);
log2(" checking up on eventRequest1");
@@ -379,7 +380,7 @@
testExitCode = FAILED;
log3("ERROR: EventRequest is enabled");
}
-
+ vm.resume();
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java
index ac1c2fc..e0cb8ca 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled001.java
@@ -362,6 +362,7 @@
throw new JDITestRuntimeException("** default case 2 **");
}
+ vm.suspend();
log2("......eventRequest1.setEnable(true);");
eventRequest1.setEnabled(true);
log2(" checking up on eventRequest1");
@@ -377,7 +378,7 @@
testExitCode = FAILED;
log3("ERROR: EventRequest is enabled");
}
-
+ vm.resume();
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java
index b598b0d..7974b00 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled002.java
@@ -368,6 +368,7 @@
throw new JDITestRuntimeException("** default case 2 **");
}
+ vm.suspend();
if (eventRequest1 instanceof StepRequest) {
try {
log2("......eventRequest1.setEnabled(true); IllegalThreadStateException is expected");
@@ -405,6 +406,7 @@
} catch ( InvalidRequestStateException e ) {
log2(" InvalidRequestStateException");
}
+ vm.resume();
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java
index 6817dad..799c253 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setEnabled/setenabled003.java
@@ -282,7 +282,7 @@
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ variable part
-
+ vm.suspend();
switch (i) {
case 0:
@@ -292,7 +292,6 @@
log2("......setting up StepRequest");
eventRequest1 = eventRManager.createStepRequest
(thread1, StepRequest.STEP_MIN, StepRequest.STEP_INTO);
-
try {
log2("......eventRequest1.setEnabled(true); IllegalThreadStateException is expected");
eventRequest1.setEnabled(true);
@@ -359,6 +358,7 @@
default:
throw new JDITestRuntimeException("** default case 2 **");
}
+ vm.resume();
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java
index 5da99f0..90ad166 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jdi/EventRequest/setSuspendPolicy/setsuspendpolicy001.java
@@ -401,6 +401,7 @@
log3("ERROR: suspendPolicy() != EventRequest.SUSPEND_NONE");
}
+ vm.suspend();
log2("......eventRequest1.setEnabled(true);");
eventRequest1.setEnabled(true);
try {
@@ -421,6 +422,7 @@
} catch ( InvalidRequestStateException e ) {
log2(" InvalidRequestStateException");
}
+ vm.resume();
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
}
diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java
index 9d0950e..a416427 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/JDIBase.java
@@ -161,7 +161,7 @@
return;
}
- throw new JDITestRuntimeException("** event IS NOT a breakpoint **");
+ throw new JDITestRuntimeException("** event '" + event + "' IS NOT a breakpoint **");
}
}
