--- old/test/java/lang/invoke/LFCaching/LambdaFormTestCase.java 2014-10-17 13:26:56.617069724 +0400 +++ new/test/java/lang/invoke/LFCaching/LambdaFormTestCase.java 2014-10-17 13:26:56.373981176 +0400 @@ -26,7 +26,9 @@ import java.lang.management.ManagementFactory; import java.lang.reflect.Method; import java.util.Collection; +import java.util.concurrent.TimeUnit; import java.util.function.Function; +import jdk.testlibrary.Utils; /** * Lambda forms caching test case class. Contains all necessary test routines to @@ -41,6 +43,7 @@ private final static String INTERNAL_FORM_METHOD_NAME = "internalForm"; private static final double ITERATIONS_TO_CODE_CACHE_SIZE_RATIO = 45 / (128.0 * 1024 * 1024); + private static final long TIMEOUT = Utils.adjustTimeout(TimeUnit.SECONDS.toMillis(120)); /** * Reflection link to {@code j.l.i.MethodHandle.internalForm} method. It is @@ -120,6 +123,7 @@ System.out.printf("Number of iterations is set to %d (%d cases)%n", iterations, iterations * testCaseNum); System.out.flush(); + long startTime = System.currentTimeMillis(); for (long i = 0; i < iterations; i++) { System.err.println(String.format("Iteration %d:", i)); for (TestMethods testMethod : testMethods) { @@ -137,6 +141,14 @@ } testCounter++; } + long passedTime = System.currentTimeMillis() - startTime; + long avgIterTime = passedTime / (i + 1); + long remainTime = TIMEOUT - passedTime; + if (avgIterTime > 2 * remainTime) { + System.err.printf("Stopping iterations because of lack of time.%n" + + "Increase timeout factor for more iterations.%n"); + break; + } } if (!passed) { throw new Error(String.format("%d of %d test cases FAILED! %n"