From 8f540da22d89bb66cd99aca6141547a67235dfe4 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Mon, 28 Apr 2014 16:42:01 -0400
Subject: [PATCH] Fix tests when doclint is disabled by default

Include original author and the author of test-fixes patch.
---
 disable-doclint-by-default.patch | 37 +++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/disable-doclint-by-default.patch b/disable-doclint-by-default.patch
index 8f08850..11e7896 100644
--- a/disable-doclint-by-default.patch
+++ b/disable-doclint-by-default.patch
@@ -8,9 +8,10 @@ versions of OpenJDK.
 See: http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html
 See: https://lists.fedoraproject.org/pipermail/java-devel/2014-February/005150.html
 
-diff -r 9d81ae1c417a jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
---- jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java	Thu Feb 06 17:35:47 2014 -0800
-+++ jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java	Mon Feb 24 19:44:12 2014 +0000
+Author: Andrew John Hughes <ahughes@redhat.com>
+Author: Emmanuel Bourg <ebourg@apache.org>
+--- jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
++++ jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
 @@ -811,10 +811,9 @@
              doclintOpts.add(opt == null ? DocLint.XMSGS_OPTION : DocLint.XMSGS_CUSTOM_PREFIX + opt);
          }
@@ -25,3 +26,33 @@ diff -r 9d81ae1c417a jdk8/langtools/src/share/classes/com/sun/tools/javadoc/DocE
              return;
          }
  
+--- jdk8/langtools/test/tools/javadoc/doclint/DocLintTest.java
++++ jdk8/langtools/test/tools/javadoc/doclint/DocLintTest.java
+@@ -130,12 +130,12 @@
+         };
+ 
+         test(Collections.<String>emptyList(),
+-                Main.Result.ERROR,
+-                EnumSet.of(Message.DL_ERR9A, Message.DL_WRN12A));
++                Main.Result.OK,
++                EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
+ 
+         test(Arrays.asList(rawDiags),
+-                Main.Result.ERROR,
+-                EnumSet.of(Message.DL_ERR9, Message.DL_WRN12));
++                Main.Result.OK,
++                EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
+ 
+         test(Arrays.asList("-Xdoclint:none"),
+                 Main.Result.OK,
+@@ -158,8 +158,8 @@
+                 EnumSet.of(Message.DL_WRN12));
+ 
+         test(Arrays.asList(rawDiags, "-private"),
+-                Main.Result.ERROR,
+-                EnumSet.of(Message.DL_ERR6, Message.DL_ERR9, Message.DL_WRN12));
++                Main.Result.OK,
++                EnumSet.of(Message.JD_WRN10, Message.JD_WRN13));
+ 
+         test(Arrays.asList(rawDiags, "-Xdoclint:syntax", "-private"),
+                 Main.Result.ERROR,