changeset 3127:aebf9484a765

8029504: Regression: TestDocRootLink test fails on Windows Reviewed-by: bpatel, jjg
author ksrini
date Fri, 06 Dec 2013 09:07:47 -0800
parents be07a9f8f5f0
children 5147975ac108
files src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Wed Dec 18 10:29:25 2013 -0500
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java	Fri Dec 06 09:07:47 2013 -0800
@@ -1363,7 +1363,7 @@
             return new ContentBuilder();
         }
 
-        String seetext = replaceDocRootDir(see.text());
+        String seetext = replaceDocRootDir(Util.normalizeNewlines(see.text()));
 
         //Check if @see is an href or "string"
         if (seetext.startsWith("<") || seetext.startsWith("\"")) {
--- a/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java	Wed Dec 18 10:29:25 2013 -0500
+++ b/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java	Fri Dec 06 09:07:47 2013 -0800
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 6553182 8025416
+ * @bug 6553182 8025416 8029504
  * @summary This test verifies the -Xdocrootparent option.
  * @author Bhavesh Patel
  * @library ../lib/