Skip to content

backport: cctest TAP output changes #9682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mscdex wants to merge 6 commits into from
Closed

backport: cctest TAP output changes #9682

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f72f02f
deps: make gtest output tap
bnoordhuis Aug 9, 2016
938e67a
build: run cctests as part of test-ci target
bnoordhuis Aug 10, 2016
7f81919
deps: revert default gtest reporter change
mscdex Oct 17, 2016
d2693b1
test: output tap13 instead of almost-tap
jbergstroem Oct 12, 2016
a7d90df
gtest: output tap comments as yamlish
jbergstroem Oct 25, 2016
0b8be2a
gitignore: ignore all tap files
jbergstroem Oct 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
gtest: output tap comments as yamlish 
This makes yaml-ish parsers happy.
Note: gtest still seems to output the expected/result slightly
different making the full traceback less informational.

PR-URL: #9262
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
  • Loading branch information
@jbergstroem @mscdex
jbergstroem authored and mscdex committed Nov 18, 2016
commit a7d90df8032f0f363461edf9d5a05a030c796a32
16 changes: 9 additions & 7 deletions deps/gtest/src/gtest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3596,25 +3596,27 @@ void TapUnitTestResultPrinter::OutputTapTestInfo(int* count,
*stream << " ---\n";
*stream << " duration_ms: " <<
FormatTimeInMillisAsSeconds(result.elapsed_time()) << "\n";
*stream << " ...\n";

for (int i = 0; i < result.total_part_count(); ++i) {
const TestPartResult& part = result.GetTestPartResult(i);
OutputTapComment(stream, part.message());
if (result.total_part_count() > 0) {
*stream << " stack: |-\n";
for (int i = 0; i < result.total_part_count(); ++i) {
const TestPartResult& part = result.GetTestPartResult(i);
OutputTapComment(stream, part.message());
}
}

*stream << " ...\n";
*count += 1;
}

void TapUnitTestResultPrinter::OutputTapComment(::std::ostream* stream,
const char* comment) {
const char* start = comment;
while (const char* end = strchr(start, '\n')) {
*stream << "# " << std::string(start, end) << "\n";
*stream << " " << std::string(start, end) << "\n";
start = end + 1;
}
if (*start)
*stream << "# " << start << "\n";
*stream << " " << start << "\n";
}

// Formats the given time in milliseconds as seconds.
Expand Down