<div dir="ltr">Hello Diego,<br><br>This commit added broken test to one of our win builders:<br><br><a href="http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/27202">http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/27202</a><br><br>. . .<br>Failing Tests (4):<br> Extra Tools Unit Tests :: clang-doc/./ClangDocTests.exe/HTMLGeneratorTest.emitRecordHTML<br> . . . <br><br>Please have a look?<br>These builder was already red and did not send any notifications.<br><br>Thanks<br><br>Galina</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Jul 26, 2019 at 11:02 AM Diego Astiazaran via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: diegoastiazaran<br>
Date: Fri Jul 26 11:02:42 2019<br>
New Revision: 367137<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=367137&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=367137&view=rev</a><br>
Log:<br>
[clang-format] Fix style of css file paths<br>
<br>
CSS files included in HTML should have a path in posix style, it should<br>
not be different for Windows.<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D65309" rel="noreferrer" target="_blank">https://reviews.llvm.org/D65309</a><br>
<br>
Modified:<br>
clang-tools-extra/trunk/clang-doc/HTMLGenerator.cpp<br>
clang-tools-extra/trunk/unittests/clang-doc/HTMLGeneratorTest.cpp<br>
<br>
Modified: clang-tools-extra/trunk/clang-doc/HTMLGenerator.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-doc/HTMLGenerator.cpp?rev=367137&r1=367136&r2=367137&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-doc/HTMLGenerator.cpp?rev=367137&r1=367136&r2=367137&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-doc/HTMLGenerator.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-doc/HTMLGenerator.cpp Fri Jul 26 11:02:42 2019<br>
@@ -231,6 +231,8 @@ genStylesheetsHTML(StringRef InfoPath, c<br>
SmallString<128> StylesheetPath = computeRelativePath("", InfoPath);<br>
llvm::sys::path::append(StylesheetPath,<br>
llvm::sys::path::filename(FilePath));<br>
+ // Paths in HTML must be in posix-style<br>
+ llvm::sys::path::native(StylesheetPath, llvm::sys::path::Style::posix);<br>
LinkNode->Attributes.try_emplace("href", StylesheetPath);<br>
Out.emplace_back(std::move(LinkNode));<br>
}<br>
<br>
Modified: clang-tools-extra/trunk/unittests/clang-doc/HTMLGeneratorTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clang-doc/HTMLGeneratorTest.cpp?rev=367137&r1=367136&r2=367137&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clang-doc/HTMLGeneratorTest.cpp?rev=367137&r1=367136&r2=367137&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/unittests/clang-doc/HTMLGeneratorTest.cpp (original)<br>
+++ clang-tools-extra/trunk/unittests/clang-doc/HTMLGeneratorTest.cpp Fri Jul 26 11:02:42 2019<br>
@@ -110,34 +110,23 @@ TEST(HTMLGeneratorTest, emitRecordHTML)<br>
ClangDocContext CDCtx = getClangDocContext();<br>
auto Err = G->generateDocForInfo(&I, Actual, CDCtx);<br>
assert(!Err);<br>
- SmallString<16> PathToF;<br>
- llvm::sys::path::native("../../../path/to/F.html", PathToF);<br>
- SmallString<16> PathToInt;<br>
- llvm::sys::path::native("../int.html", PathToInt);<br>
- SmallString<16> PathToSylesheet;<br>
- llvm::sys::path::native("../../../clang-doc-default-stylesheet.css",<br>
- PathToSylesheet);<br>
std::string Expected = R"raw(<!DOCTYPE html><br>
<meta charset="utf-8"/><br>
<title>class r</title><br>
-<link rel="stylesheet" href=")raw" +<br>
- std::string(PathToSylesheet.str()) +<br>
- R"raw("/><br>
+<link rel="stylesheet" href="../../../clang-doc-default-stylesheet.css"/><br>
<div><br>
<h1>class r</h1><br>
<p>Defined at line 10 of test.cpp</p><br>
<p><br>
Inherits from <br>
- <a href=")raw" + std::string(PathToF.str()) +<br>
- R"raw(">F</a><br>
+ <a href="../../../path/to/F.html">F</a><br>
, G<br>
</p><br>
<h2>Members</h2><br>
<ul><br>
<li><br>
private <br>
- <a href=")raw" + std::string(PathToInt.str()) +<br>
- R"raw(">int</a><br>
+ <a href="../int.html">int</a><br>
X<br>
</li><br>
</ul><br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>