[openjdk-8] 01/01: Modified the doclint tests checking the default behaviour

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository openjdk-8.

commit f4338ff9081eb0e058fd4a05fb4572b60b2c54cc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Apr 17 01:11:48 2014 +0200

    Modified the doclint tests checking the default behaviour
---
 debian/patches/disable-doclint-by-default.patch | 32 ++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/debian/patches/disable-doclint-by-default.patch b/debian/patches/disable-doclint-by-default.patch
index ff72f5c..65f6294 100644
--- a/debian/patches/disable-doclint-by-default.patch
+++ b/debian/patches/disable-doclint-by-default.patch
@@ -7,7 +7,7 @@ Description: Disable doclint by default
  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
 Author: Andrew John Hughes <ahughes at redhat.com>
-Forwarded: no
+Forwarded: not-needed
 --- a/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
 +++ b/langtools/src/share/classes/com/sun/tools/javadoc/DocEnv.java
 @@ -811,10 +811,9 @@
@@ -24,3 +24,33 @@ Forwarded: no
              return;
          }
  
+--- a/langtools/test/tools/javadoc/doclint/DocLintTest.java
++++ b/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,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjdk-8.git