ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/JSR166TestCase.java

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.166 by jsr166, Mon Oct 5 21:39:39 2015 UTC vs.
Revision 1.169 by jsr166, Thu Oct 8 21:50:26 2015 UTC

#	Line 200 | Line 200 | public class JSR166TestCase extends Test
200		System.err.println
201		("Looks like we're stuck running test: "
202		+ lastTestCase);
203	+	System.err.println("availableProcessors=" +
204	+	Runtime.getRuntime().availableProcessors());
205		dumpTestThreads();
206		// one stack dump is probably enough; more would be spam
207		break;
#	Line 826 | Line 828 | public class JSR166TestCase extends Test
828		} finally {
829		// last resort, for the benefit of subsequent tests
830		pool.shutdownNow();
831	<	pool.awaitTermination(SMALL_DELAY_MS, MILLISECONDS);
831	>	pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
832		}
833		}
834		} catch (SecurityException ok) {
#	Line 1203 | Line 1205 | public class JSR166TestCase extends Test
1205		} finally {
1206		if (t.getState() != Thread.State.TERMINATED) {
1207		t.interrupt();
1208	<	fail("Test timed out");
1208	>	threadFail("Test timed out");
1209		}
1210		}
1211		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines