stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8039466: Tests failing in langtools repository

Browse Source 
Fixing tests broken by JDK-8038455.

Reviewed-by: jjg
This commit is contained in:
Jan Lahoda 2014-04-08 23:33:50 +02:00
parent e5c8101894
commit 5905e8f494
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
langtools/test/tools/javac/processing/errors/TestBadProcessor.java
View File

@ -75,7 +75,8 @@ public class TestBadProcessor {
"javax.annotation.processing.Processor: " + "javax.annotation.processing.Processor: " +
"Provider AnnoProc could not be instantiated: java.lang.Error\n" + "Provider AnnoProc could not be instantiated: java.lang.Error\n" +
"1 error"; "1 error";
if (!out.trim().equals(expect)) { String lineSeparator = System.getProperty("line.separator");
if (!out.trim().replace(lineSeparator, "\n").equals(expect)) {
System.err.println("expected: " + expect); System.err.println("expected: " + expect);
error("output not as expected"); error("output not as expected");
} }

6
langtools/test/tools/javac/processing/rounds/OverwriteBetweenCompilations.java
View File

@ -29,9 +29,9 @@
* @library /tools/javac/lib/ * @library /tools/javac/lib/
* @clean * * @clean *
* @build OverwriteBetweenCompilations ToolBox JavacTestingAbstractProcessor * @build OverwriteBetweenCompilations ToolBox JavacTestingAbstractProcessor
* @compile/ref=OverwriteBetweenCompilations_1.out -processor OverwriteBetweenCompilations -Apass=1 -XDrawDiagnostics OverwriteBetweenCompilationsSource.java * @compile/ref=OverwriteBetweenCompilations_1.out -processor OverwriteBetweenCompilations -Apass=1 -parameters -XDrawDiagnostics OverwriteBetweenCompilationsSource.java
* @compile/ref=OverwriteBetweenCompilations_2.out -processor OverwriteBetweenCompilations -Apass=2 -XDrawDiagnostics OverwriteBetweenCompilationsSource.java * @compile/ref=OverwriteBetweenCompilations_2.out -processor OverwriteBetweenCompilations -Apass=2 -parameters -XDrawDiagnostics OverwriteBetweenCompilationsSource.java
* @compile/ref=OverwriteBetweenCompilations_3.out -processor OverwriteBetweenCompilations -Apass=3 -XDrawDiagnostics OverwriteBetweenCompilationsSource.java * @compile/ref=OverwriteBetweenCompilations_3.out -processor OverwriteBetweenCompilations -Apass=3 -parameters -XDrawDiagnostics OverwriteBetweenCompilationsSource.java
*/ */
import java.io.*; import java.io.*;