# HG changeset patch # User ksrini # Date 1386349667 28800 # Node ID fe9f4b305bcf9f4407a37b91314133fe1ef439c3 # Parent 682da512ec173dcfc120150a3f9fb3cfc3cd30f0 8029504: Regression: TestDocRootLink test fails on Windows Reviewed-by: bpatel, jjg diff -r 682da512ec17 -r fe9f4b305bcf langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java --- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/HtmlDocletWriter.java Wed Dec 18 10:29:25 2013 -0500 +++ b/langtools/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("\"")) { diff -r 682da512ec17 -r fe9f4b305bcf langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java --- a/langtools/test/com/sun/javadoc/testDocRootLink/TestDocRootLink.java Wed Dec 18 10:29:25 2013 -0500 +++ b/langtools/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/