changeset 2354:c8e5b35c63d3

8039466: Tests failing in langtools repository. Summary: Fixing tests broken by JDK-8038455. Reviewed-by: jjg
author jlahoda
date Tue, 08 Apr 2014 23:33:50 +0200
parents d8d27b8088fd
children bc2ee7cf5966
files test/tools/javac/processing/errors/TestBadProcessor.java test/tools/javac/processing/rounds/OverwriteBetweenCompilations.java
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/test/tools/javac/processing/errors/TestBadProcessor.java	Tue Apr 08 14:06:11 2014 +0200
+++ b/test/tools/javac/processing/errors/TestBadProcessor.java	Tue Apr 08 23:33:50 2014 +0200
@@ -75,7 +75,8 @@
                 "javax.annotation.processing.Processor: " +
                 "Provider AnnoProc could not be instantiated: java.lang.Error\n" +
                 "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);
             error("output not as expected");
         }
--- a/test/tools/javac/processing/rounds/OverwriteBetweenCompilations.java	Tue Apr 08 14:06:11 2014 +0200
+++ b/test/tools/javac/processing/rounds/OverwriteBetweenCompilations.java	Tue Apr 08 23:33:50 2014 +0200
@@ -29,9 +29,9 @@
  * @library /tools/javac/lib/
  * @clean *
  * @build OverwriteBetweenCompilations ToolBox JavacTestingAbstractProcessor
- * @compile/ref=OverwriteBetweenCompilations_1.out -processor OverwriteBetweenCompilations -Apass=1 -XDrawDiagnostics OverwriteBetweenCompilationsSource.java
- * @compile/ref=OverwriteBetweenCompilations_2.out -processor OverwriteBetweenCompilations -Apass=2 -XDrawDiagnostics OverwriteBetweenCompilationsSource.java
- * @compile/ref=OverwriteBetweenCompilations_3.out -processor OverwriteBetweenCompilations -Apass=3 -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 -parameters -XDrawDiagnostics OverwriteBetweenCompilationsSource.java
+ * @compile/ref=OverwriteBetweenCompilations_3.out -processor OverwriteBetweenCompilations -Apass=3 -parameters -XDrawDiagnostics OverwriteBetweenCompilationsSource.java
  */
 
 import java.io.*;