1.1 --- a/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java Wed Jan 23 15:08:03 2013 +0000 1.2 +++ b/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java Wed Jan 23 20:57:40 2013 +0000 1.3 @@ -23,13 +23,17 @@ 1.4 1.5 /* 1.6 * @test 1.7 - * @bug 7046778 1.8 + * @bug 7046778 8006694 1.9 * @summary Project Coin: problem with diamond and member inner classes 1.10 + * temporarily workaround combo tests are causing time out in several platforms 1.11 * @library ../../../lib 1.12 * @build JavacTestingAbstractThreadedTest 1.13 - * @run main DiamondAndInnerClassTest 1.14 + * @run main/othervm DiamondAndInnerClassTest 1.15 */ 1.16 1.17 +// use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047) 1.18 +// see JDK-8006746 1.19 + 1.20 import com.sun.source.util.JavacTask; 1.21 import java.net.URI; 1.22 import java.util.Arrays;