Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > langtools
changeset 2217:2d0a0ae7fa9c
8029504: Regression: TestDocRootLink test fails on Windows
Reviewed-by: bpatel, jjg
author | ksrini |
---|---|
date | Fri, 06 Dec 2013 09:07:47 -0800 |
parents | 4a2ed1900428 |
children | 5bf0af735c61 |
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 04 15:39:36 2013 -0800 +++ 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 04 15:39:36 2013 -0800 +++ 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/