[clang-tools-extra] r367137 - [clang-format] Fix style of css file paths

Mon Jul 29 12:12:13 PDT 2019

Hello Diego,

This commit added broken test to one of our win builders:

http://lab.llvm.org:8011/builders/llvm-clang-lld-x86_64-scei-ps4-windows10pro-fast/builds/27202

. . .
Failing Tests (4):
    Extra Tools Unit Tests ::
clang-doc/./ClangDocTests.exe/HTMLGeneratorTest.emitRecordHTML
    . . .

Please have a look?
These builder was already red and did not send any notifications.

Thanks

Galina

On Fri, Jul 26, 2019 at 11:02 AM Diego Astiazaran via cfe-commits <
cfe-commits at lists.llvm.org> wrote:

> Author: diegoastiazaran
> Date: Fri Jul 26 11:02:42 2019
> New Revision: 367137
>
> URL: http://llvm.org/viewvc/llvm-project?rev=367137&view=rev
> Log:
> [clang-format] Fix style of css file paths
>
> CSS files included in HTML should have a path in posix style, it should
> not be different for Windows.
>
> Differential Revision: https://reviews.llvm.org/D65309
>
> Modified:
>     clang-tools-extra/trunk/clang-doc/HTMLGenerator.cpp
>     clang-tools-extra/trunk/unittests/clang-doc/HTMLGeneratorTest.cpp
>
> Modified: clang-tools-extra/trunk/clang-doc/HTMLGenerator.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-doc/HTMLGenerator.cpp?rev=367137&r1=367136&r2=367137&view=diff
>
> ==============================================================================
> --- clang-tools-extra/trunk/clang-doc/HTMLGenerator.cpp (original)
> +++ clang-tools-extra/trunk/clang-doc/HTMLGenerator.cpp Fri Jul 26
> 11:02:42 2019
> @@ -231,6 +231,8 @@ genStylesheetsHTML(StringRef InfoPath, c
>      SmallString<128> StylesheetPath = computeRelativePath("", InfoPath);
>      llvm::sys::path::append(StylesheetPath,
>                              llvm::sys::path::filename(FilePath));
> +    // Paths in HTML must be in posix-style
> +    llvm::sys::path::native(StylesheetPath,
> llvm::sys::path::Style::posix);
>      LinkNode->Attributes.try_emplace("href", StylesheetPath);
>      Out.emplace_back(std::move(LinkNode));
>    }
>
> Modified: clang-tools-extra/trunk/unittests/clang-doc/HTMLGeneratorTest.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clang-doc/HTMLGeneratorTest.cpp?rev=367137&r1=367136&r2=367137&view=diff
>
> ==============================================================================
> --- clang-tools-extra/trunk/unittests/clang-doc/HTMLGeneratorTest.cpp
> (original)
> +++ clang-tools-extra/trunk/unittests/clang-doc/HTMLGeneratorTest.cpp Fri
> Jul 26 11:02:42 2019
> @@ -110,34 +110,23 @@ TEST(HTMLGeneratorTest, emitRecordHTML)
>    ClangDocContext CDCtx = getClangDocContext();
>    auto Err = G->generateDocForInfo(&I, Actual, CDCtx);
>    assert(!Err);
> -  SmallString<16> PathToF;
> -  llvm::sys::path::native("../../../path/to/F.html", PathToF);
> -  SmallString<16> PathToInt;
> -  llvm::sys::path::native("../int.html", PathToInt);
> -  SmallString<16> PathToSylesheet;
> -  llvm::sys::path::native("../../../clang-doc-default-stylesheet.css",
> -                          PathToSylesheet);
>    std::string Expected = R"raw(<!DOCTYPE html>
>  <meta charset="utf-8"/>
>  <title>class r</title>
> -<link rel="stylesheet" href=")raw" +
> -                         std::string(PathToSylesheet.str()) +
> -                         R"raw("/>
> +<link rel="stylesheet" href="../../../clang-doc-default-stylesheet.css"/>
>  <div>
>    <h1>class r</h1>
>    <p>Defined at line 10 of test.cpp</p>
>    <p>
>      Inherits from
> -    <a href=")raw" + std::string(PathToF.str()) +
> -                         R"raw(">F</a>
> +    <a href="../../../path/to/F.html">F</a>
>      , G
>    </p>
>    <h2>Members</h2>
>    <ul>
>      <li>
>        private
> -      <a href=")raw" + std::string(PathToInt.str()) +
> -                         R"raw(">int</a>
> +      <a href="../int.html">int</a>
>         X
>      </li>
>    </ul>
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20190729/23ddb4a2/attachment.html>