8006694: temporarily workaround combo tests are causing time out in several platforms

Reviewed-by: jjg
This commit is contained in:
Maurizio Cimadamore 2013-01-23 20:57:40 +00:00 committed by Vicente Romero
parent eb646f3c09
commit 5b1a78dc92
20 changed files with 113 additions and 61 deletions

View file

@ -26,6 +26,7 @@ import java.io.StringWriter;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import javax.tools.JavaCompiler;
import javax.tools.StandardJavaFileManager;
@ -67,9 +68,7 @@ public abstract class JavacTestingAbstractThreadedTest {
protected static void checkAfterExec(boolean printCheckCount)
throws InterruptedException {
pool.shutdown();
while (!pool.isTerminated()) {
Thread.sleep(10);
}
pool.awaitTermination(15, TimeUnit.MINUTES);
if (errCount.get() > 0) {
if (throwAssertionOnError) {
closePrinters();