This is an archive of the discontinued LLVM Phabricator instance.

[clang-doc] Fix failing tests on Windows
ClosedPublic

Authored by DiegoAstiazaran on Jul 25 2019, 4:07 PM.

Download Raw Diff

Details

Reviewers

Commits

rG30ca2828a61d: [clang-doc] Fix failing tests on Windows
rL367074: [clang-doc] Fix failing tests on Windows
rCTE367074: [clang-doc] Fix failing tests on Windows

Summary

Tests on Windows were failing due to path separator differences.
'/' was being used as separator in the expected output, paths in expected output are now changed to their native form before comparing them to the actual output.

Diff Detail

Repository: rL LLVM

Event Timeline

DiegoAstiazaran created this revision.Jul 25 2019, 4:07 PM

Make sure you update the other stylesheet patch, as well, before landing that.

This revision is now accepted and ready to land.Jul 25 2019, 4:10 PM

Closed by commit rL367074: [clang-doc] Fix failing tests on Windows (authored by DiegoAstiazaran). · Explain WhyJul 25 2019, 4:22 PM

This revision was automatically updated to reflect the committed changes.

Herald added a project: Restricted Project. · View Herald TranscriptJul 25 2019, 4:22 PM

Herald added a subscriber: llvm-commits. · View Herald Transcript

Revision Contents

Path

Size

clang-tools-extra/

trunk/

unittests/

clang-doc/

HTMLGeneratorTest.cpp

7 lines

Diff 211854

clang-tools-extra/trunk/unittests/clang-doc/HTMLGeneratorTest.cpp

Show First 20 Lines • Show All 108 Lines • ▼ Show 20 Lines	TEST(HTMLGeneratorTest, emitRecordHTML) {
llvm::raw_string_ostream Actual(Buffer);		llvm::raw_string_ostream Actual(Buffer);
ClangDocContext CDCtx = getClangDocContext();		ClangDocContext CDCtx = getClangDocContext();
auto Err = G->generateDocForInfo(&I, Actual, CDCtx);		auto Err = G->generateDocForInfo(&I, Actual, CDCtx);
assert(!Err);		assert(!Err);
SmallString<16> PathToF;		SmallString<16> PathToF;
llvm::sys::path::native("../../../path/to/F.html", PathToF);		llvm::sys::path::native("../../../path/to/F.html", PathToF);
SmallString<16> PathToInt;		SmallString<16> PathToInt;
llvm::sys::path::native("../int.html", 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>		std::string Expected = R"raw(<!DOCTYPE html>
<meta charset="utf-8"/>		<meta charset="utf-8"/>
<title>class r</title>		<title>class r</title>
<link rel="stylesheet" href="../../../clang-doc-default-stylesheet.css"/>		<link rel="stylesheet" href=")raw" +
		std::string(PathToSylesheet.str()) +
		R"raw("/>
<div>		<div>
<h1>class r</h1>		<h1>class r</h1>
<p>Defined at line 10 of test.cpp</p>		<p>Defined at line 10 of test.cpp</p>
<p>		<p>
Inherits from		Inherits from
<a href=")raw" + std::string(PathToF.str()) +		<a href=")raw" + std::string(PathToF.str()) +
R"raw(">F</a>		R"raw(">F</a>
, G		, G
▲ Show 20 Lines • Show All 186 Lines • Show Last 20 Lines