--- a/jdk/test/com/sun/jdi/SuspendThreadTest.java Thu Dec 03 22:30:21 2015 -0800
+++ b/jdk/test/com/sun/jdi/SuspendThreadTest.java Mon Dec 07 17:04:37 2015 +0000
@@ -42,6 +42,7 @@
class SuspendThreadTarg {
public static long count;
+ public static boolean active = true;
public static void bkpt() {
count++;
@@ -53,7 +54,7 @@
// We need this to be running so the bkpt
// can be hit immediately when it is enabled
// in the back-end.
- while(count >= 0) {
+ while(active) {
bkpt();
}
System.out.println("Goodbye from SuspendThreadTarg, count = " + count);
@@ -82,9 +83,9 @@
// to guard against spurious wakeups from bkptSignal.wait()
boolean signalSent;
// signal that a breakpoint has happened
- Object bkptSignal = new Object() {};
+ final private Object bkptSignal = new Object() {};
BreakpointRequest bkptRequest;
- Field debuggeeCountField;
+ Field debuggeeCountField, debuggeeActiveField;
// When we get a bkpt we want to disable the request,
// resume the debuggee, and then re-enable the request
@@ -119,65 +120,71 @@
/********** test core **********/
protected void runTests() throws Exception {
- /*
- * Get to the top of main()
- * to determine targetClass and mainThread
- */
- BreakpointEvent bpe = startToMain("SuspendThreadTarg");
- targetClass = (ClassType)bpe.location().declaringType();
- mainThread = bpe.thread();
- EventRequestManager erm = vm().eventRequestManager();
+ try {
+ /*
+ * Get to the top of main()
+ * to determine targetClass and mainThread
+ */
+ BreakpointEvent bpe = startToMain("SuspendThreadTarg");
+ targetClass = (ClassType)bpe.location().declaringType();
+ mainThread = bpe.thread();
+ EventRequestManager erm = vm().eventRequestManager();
- Location loc1 = findMethod(targetClass, "bkpt", "()V").location();
+ Location loc1 = findMethod(targetClass, "bkpt", "()V").location();
- bkptRequest = erm.createBreakpointRequest(loc1);
+ bkptRequest = erm.createBreakpointRequest(loc1);
- // Without this, it is a SUSPEND_ALL bkpt and the test will pass
- bkptRequest.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
- bkptRequest.enable();
+ // Without this, it is a SUSPEND_ALL bkpt and the test will pass
+ bkptRequest.setSuspendPolicy(EventRequest.SUSPEND_EVENT_THREAD);
+ bkptRequest.enable();
- debuggeeCountField = targetClass.fieldByName("count");
- try {
- addListener (this);
- } catch (Exception ex){
- ex.printStackTrace();
- failure("failure: Could not add listener");
- throw new Exception("SuspendThreadTest: failed", ex);
- }
+ debuggeeCountField = targetClass.fieldByName("count");
+ debuggeeActiveField = targetClass.fieldByName("active");
+ try {
+ addListener (this);
+ } catch (Exception ex){
+ ex.printStackTrace();
+ failure("failure: Could not add listener");
+ throw new Exception("SuspendThreadTest: failed", ex);
+ }
- int prevBkptCount;
- vm().resume();
- synchronized (bkptSignal) {
- while (bkptCount < maxBkpts) {
- prevBkptCount = bkptCount;
- // If we don't get a bkpt within 5 secs,
- // the test fails
- signalSent = false;
- do {
- try {
- bkptSignal.wait(5000);
- } catch (InterruptedException ee) {
+ int prevBkptCount;
+ vm().resume();
+ synchronized (bkptSignal) {
+ while (bkptCount < maxBkpts) {
+ prevBkptCount = bkptCount;
+ // If we don't get a bkpt within 5 secs,
+ // the test fails
+ signalSent = false;
+ do {
+ try {
+ bkptSignal.wait(5000);
+ } catch (InterruptedException ee) {
+ }
+ } while (signalSent == false);
+ if (prevBkptCount == bkptCount) {
+ failure("failure: test hung");
+ break;
}
- } while (signalSent == false);
- if (prevBkptCount == bkptCount) {
- failure("failure: test hung");
- break;
}
}
- }
- println("done with loop");
- bkptRequest.disable();
- removeListener(this);
-
+ println("done with loop");
+ bkptRequest.disable();
+ removeListener(this);
- /*
- * deal with results of test
- * if anything has called failure("foo") testFailed will be true
- */
- if (!testFailed) {
- println("SuspendThreadTest: passed");
- } else {
- throw new Exception("SuspendThreadTest: failed");
+ /*
+ * deal with results of test
+ * if anything has called failure("foo") testFailed will be true
+ */
+ if (!testFailed) {
+ println("SuspendThreadTest: passed");
+ } else {
+ throw new Exception("SuspendThreadTest: failed");
+ }
+ } finally {
+ if (targetClass != null && debuggeeActiveField != null) {
+ targetClass.setValue(debuggeeActiveField, vm().mirrorOf(false));
+ }
}
}
}
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Asserts.java Thu Dec 03 22:30:21 2015 -0800
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Asserts.java Mon Dec 07 17:04:37 2015 +0000
@@ -42,7 +42,11 @@
* multiple times, then the line number won't provide enough context to
* understand the failure.
* </pre>
+ *
+ * @deprecated This class is deprecated. Use the one from
+ * {@code <root>/test/lib/share/classes/jdk/test/lib}
*/
+@Deprecated
public class Asserts {
/**
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java Thu Dec 03 22:30:21 2015 -0800
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java Mon Dec 07 17:04:37 2015 +0000
@@ -27,6 +27,11 @@
import java.nio.file.Path;
import java.nio.file.Paths;
+/**
+ * @deprecated This class is deprecated. Use the one from
+ * {@code <root>/test/lib/share/classes/jdk/test/lib}
+ */
+@Deprecated
public final class JDKToolFinder {
private JDKToolFinder() {
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java Thu Dec 03 22:30:21 2015 -0800
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java Mon Dec 07 17:04:37 2015 +0000
@@ -46,7 +46,10 @@
* Process p = pb.start();
* }
* </pre>
+ * @deprecated This class is deprecated. Use the one from
+ * {@code <root>/test/lib/share/classes/jdk/test/lib}
*/
+@Deprecated
public class JDKToolLauncher {
private final String executable;
private final List<String> vmArgs = new ArrayList<String>();
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java Thu Dec 03 22:30:21 2015 -0800
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java Mon Dec 07 17:04:37 2015 +0000
@@ -33,7 +33,12 @@
/**
* Utility class for verifying output and exit value from a {@code Process}.
+ *
+ * @deprecated This class is deprecated. Use the one from
+ * {@code <root>/test/lib/share/classes/jdk/test/lib/process}
+ *
*/
+@Deprecated
public final class OutputAnalyzer {
private final OutputBuffer output;
private final String stdout;
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/OutputBuffer.java Thu Dec 03 22:30:21 2015 -0800
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/OutputBuffer.java Mon Dec 07 17:04:37 2015 +0000
@@ -28,6 +28,11 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
+/**
+ * @deprecated This class is deprecated. Use the one from
+ * {@code <root>/test/lib/share/classes/jdk/test/lib/process}
+ */
+@Deprecated
class OutputBuffer {
private static class OutputBufferException extends RuntimeException {
private static final long serialVersionUID = 8528687792643129571L;
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Thu Dec 03 22:30:21 2015 -0800
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java Mon Dec 07 17:04:37 2015 +0000
@@ -27,6 +27,11 @@
import java.io.FileNotFoundException;
import java.io.IOException;
+/**
+ * @deprecated This class is deprecated. Use the one from
+ * {@code <root>/test/lib/share/classes/jdk/test/lib}
+ */
+@Deprecated
public class Platform {
private static final String osName = System.getProperty("os.name");
private static final String dataModel = System.getProperty("sun.arch.data.model");
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java Thu Dec 03 22:30:21 2015 -0800
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java Mon Dec 07 17:04:37 2015 +0000
@@ -27,8 +27,6 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintStream;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -42,6 +40,12 @@
import java.util.function.Consumer;
import java.util.stream.Collectors;
+
+/**
+ * @deprecated This class is deprecated. Use the one from
+ * {@code <root>/test/lib/share/classes/jdk/test/lib/process}
+ */
+@Deprecated
public final class ProcessTools {
private static final class LineForwarder extends StreamPumper.LinePump {
private final PrintStream ps;
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/StreamPumper.java Thu Dec 03 22:30:21 2015 -0800
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/StreamPumper.java Mon Dec 07 17:04:37 2015 +0000
@@ -34,6 +34,11 @@
import java.util.concurrent.FutureTask;
import java.util.concurrent.atomic.AtomicBoolean;
+/**
+ * @deprecated This class is deprecated. Use the one from
+ * {@code <root>/test/lib/share/classes/jdk/test/lib/process}
+ */
+@Deprecated
public final class StreamPumper implements Runnable {
private static final int BUF_SIZE = 256;
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java Thu Dec 03 22:30:21 2015 -0800
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java Mon Dec 07 17:04:37 2015 +0000
@@ -41,7 +41,11 @@
/**
* Common library for various test helper functions.
+ *
+ * @deprecated This class is deprecated. Use the one from
+ * {@code <root>/test/lib/share/classes/jdk/test/lib}
*/
+@Deprecated
public final class Utils {
/**