Commit c8305f6
deps: update googletest to eff443c
PR-URL: #51657
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Ulises Gascón <ulisesgascongonzalez@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 760b788 commit c8305f6
1 file changed
Lines changed: 6 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3270,6 +3270,7 @@ bool ShouldUseColor(bool stdout_is_tty) { | |||
| 3270 | 3270 | term != nullptr && (String::CStringEquals(term, "xterm") || | |
| 3271 | 3271 | String::CStringEquals(term, "xterm-color") || | |
| 3272 | 3272 | String::CStringEquals(term, "xterm-kitty") || | |
| 3273 | + String::CStringEquals(term, "alacritty") || | ||
| 3273 | 3274 | String::CStringEquals(term, "screen") || | |
| 3274 | 3275 | String::CStringEquals(term, "tmux") || | |
| 3275 | 3276 | String::CStringEquals(term, "rxvt-unicode") || | |
@@ -4437,8 +4438,8 @@ std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes( | |||
| 4437 | 4438 | Message attributes; | |
| 4438 | 4439 | for (int i = 0; i < result.test_property_count(); ++i) { | |
| 4439 | 4440 | const TestProperty& property = result.GetTestProperty(i); | |
| 4440 | - attributes << " " << property.key() << "=" | ||
| 4441 | - << "\"" << EscapeXmlAttribute(property.value()) << "\""; | ||
| 4441 | + attributes << " " << property.key() << "=" << "\"" | ||
| 4442 | + << EscapeXmlAttribute(property.value()) << "\""; | ||
| 4442 | 4443 | } | |
| 4443 | 4444 | return attributes.GetString(); | |
| 4444 | 4445 | } | |
@@ -4748,9 +4749,7 @@ void JsonUnitTestResultPrinter::OutputJsonTestResult(::std::ostream* stream, | |||
| 4748 | 4749 | if (part.failed()) { | |
| 4749 | 4750 | *stream << ",\n"; | |
| 4750 | 4751 | if (++failures == 1) { | |
| 4751 | - *stream << kIndent << "\"" | ||
| 4752 | - << "failures" | ||
| 4753 | - << "\": [\n"; | ||
| 4752 | + *stream << kIndent << "\"" << "failures" << "\": [\n"; | ||
| 4754 | 4753 | } | |
| 4755 | 4754 | const std::string location = | |
| 4756 | 4755 | internal::FormatCompilerIndependentFileLocation(part.file_name(), | |
@@ -4900,8 +4899,8 @@ std::string JsonUnitTestResultPrinter::TestPropertiesAsJson( | |||
| 4900 | 4899 | for (int i = 0; i < result.test_property_count(); ++i) { | |
| 4901 | 4900 | const TestProperty& property = result.GetTestProperty(i); | |
| 4902 | 4901 | attributes << ",\n" | |
| 4903 | - << indent << "\"" << property.key() << "\": " | ||
| 4904 | - << "\"" << EscapeJson(property.value()) << "\""; | ||
| 4902 | + << indent << "\"" << property.key() << "\": " << "\"" | ||
| 4903 | + << EscapeJson(property.value()) << "\""; | ||
| 4905 | 4904 | } | |
| 4906 | 4905 | return attributes.GetString(); | |
| 4907 | 4906 | } | |
0 commit comments