Skip to content

Commit bfe4781

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update googletest to 7e17b15
PR-URL: #59131 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
1 parent b919fe0 commit bfe4781

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

deps/googletest/src/gtest.cc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ std::string UnitTestOptions::GetAbsolutePathToOutputFile() {
713713
const char* const gtest_output_flag = s.c_str();
714714

715715
std::string format = GetOutputFormat();
716-
if (format.empty()) format = std::string(kDefaultOutputFormat);
716+
if (format.empty()) format = kDefaultOutputFormat;
717717

718718
const char* const colon = strchr(gtest_output_flag, ':');
719719
if (colon == nullptr)
@@ -3305,6 +3305,7 @@ bool ShouldUseColor(bool stdout_is_tty) {
33053305
const bool term_supports_color =
33063306
term != nullptr && (String::CStringEquals(term, "xterm") ||
33073307
String::CStringEquals(term, "xterm-color") ||
3308+
String::CStringEquals(term, "xterm-ghostty") ||
33083309
String::CStringEquals(term, "xterm-kitty") ||
33093310
String::CStringEquals(term, "alacritty") ||
33103311
String::CStringEquals(term, "screen") ||
@@ -4354,8 +4355,8 @@ void XmlUnitTestResultPrinter::OutputXmlTestResult(::std::ostream* stream,
43544355
internal::FormatCompilerIndependentFileLocation(part.file_name(),
43554356
part.line_number());
43564357
const std::string summary = location + "\n" + part.summary();
4357-
*stream << " <skipped message=\""
4358-
<< EscapeXmlAttribute(summary.c_str()) << "\">";
4358+
*stream << " <skipped message=\"" << EscapeXmlAttribute(summary)
4359+
<< "\">";
43594360
const std::string detail = location + "\n" + part.message();
43604361
OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str());
43614362
*stream << "</skipped>\n";
@@ -6091,7 +6092,11 @@ bool UnitTestImpl::RunAllTests() {
60916092
constexpr char kNoTestsSelectedMessage[] =
60926093
"No tests were selected to run. Please make sure at least one test "
60936094
"exists and is not disabled! If the test is sharded, you may have "
6094-
"defined more shards than test cases, which is wasteful.";
6095+
"defined more shards than test cases, which is wasteful. If you also "
6096+
"defined --gtest_filter, that filter is taken into account, so "
6097+
"shards with no matching test cases will hit this error. Either "
6098+
"disable sharding, set --gtest_fail_if_no_test_selected=false, or "
6099+
"remove the filter to resolve this error.";
60956100
ColoredPrintf(GTestColor::kRed, "%s\n", kNoTestsSelectedMessage);
60966101
return false;
60976102
}

0 commit comments

Comments
 (0)