equal
deleted
inserted
replaced
21 * questions. |
21 * questions. |
22 */ |
22 */ |
23 |
23 |
24 /** |
24 /** |
25 * @test |
25 * @test |
26 * @bug 6769027 |
26 * @bug 6769027 8006694 |
27 * @summary Source line should be displayed immediately after the first diagnostic line |
27 * @summary Source line should be displayed immediately after the first diagnostic line |
|
28 * temporarily workaround combo tests are causing time out in several platforms |
28 * @author Maurizio Cimadamore |
29 * @author Maurizio Cimadamore |
29 * @library ../../lib |
30 * @library ../../lib |
30 * @build JavacTestingAbstractThreadedTest |
31 * @build JavacTestingAbstractThreadedTest |
31 * @run main/othervm T6769027 |
32 * @run main/othervm T6769027 |
32 */ |
33 */ |
|
34 |
|
35 // use /othervm to avoid jtreg timeout issues (CODETOOLS-7900047) |
|
36 // see JDK-8006746 |
33 |
37 |
34 import java.net.URI; |
38 import java.net.URI; |
35 import java.util.regex.Matcher; |
39 import java.util.regex.Matcher; |
36 import javax.tools.*; |
40 import javax.tools.*; |
37 import com.sun.tools.javac.util.*; |
41 import com.sun.tools.javac.util.*; |
486 else |
490 else |
487 errorLine += xdiagsSource.getOutput(caretKind, sourceIndent, outputKind); |
491 errorLine += xdiagsSource.getOutput(caretKind, sourceIndent, outputKind); |
488 } |
492 } |
489 |
493 |
490 if (!msg.equals(errorLine)) { |
494 if (!msg.equals(errorLine)) { |
491 printInfo(msg, errorLine); |
495 // printInfo(msg, errorLine); |
492 errCount.incrementAndGet(); |
496 errCount.incrementAndGet(); |
493 } |
497 } |
494 } |
498 } |
495 |
499 |
496 } |
500 } |