diff options
| author | Copybara-Service <copybara-worker@google.com> | 2024-03-18 20:34:04 (GMT) |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2024-03-18 20:34:04 (GMT) |
| commit | eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7 (patch) | |
| tree | eeb8565433e049e7cc9d037348a9e0379e4fcdb1 /googletest/test | |
| parent | c231e6f5b152029dbd5fa4a9e0c04095035aec3f (diff) | |
| parent | a1a608348ee09747d27a1501debf9c975142d06a (diff) | |
| download | googletest-eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7.zip googletest-eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7.tar.gz googletest-eff443c6ef5eb6ab598bfaae27f9427fdb4f6af7.tar.bz2 | |
Merge pull request #4490 from memdo:main
PiperOrigin-RevId: 616931521
Change-Id: Iffbb24e3f9add4e7acf8f1988a03afc8628b0733
Diffstat (limited to 'googletest/test')
| -rwxr-xr-x | googletest/test/googletest-color-test.py | 1 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/googletest/test/googletest-color-test.py b/googletest/test/googletest-color-test.py index 8926a48..8968cf1 100755 --- a/googletest/test/googletest-color-test.py +++ b/googletest/test/googletest-color-test.py @@ -80,6 +80,7 @@ class GTestColorTest(gtest_test_utils.TestCase): self.assertTrue(UsesColor('xterm', None, None)) self.assertTrue(UsesColor('xterm-color', None, None)) self.assertTrue(UsesColor('xterm-kitty', None, None)) + self.assertTrue(UsesColor('alacritty', None, None)) self.assertTrue(UsesColor('xterm-256color', None, None)) def testFlagOnly(self): diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 0b383ea..5d7cfb0 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -4172,8 +4172,8 @@ TEST(AssertionSyntaxTest, ExceptionAssertionsBehavesLikeSingleStatement) { #endif TEST(AssertionSyntaxTest, NoFatalFailureAssertionsBehavesLikeSingleStatement) { if (AlwaysFalse()) - EXPECT_NO_FATAL_FAILURE(FAIL()) << "This should never be executed. " - << "It's a compilation test only."; + EXPECT_NO_FATAL_FAILURE(FAIL()) + << "This should never be executed. " << "It's a compilation test only."; else ; // NOLINT @@ -6671,6 +6671,9 @@ TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) { SetEnv("TERM", "xterm-kitty"); // TERM supports colors. EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. + SetEnv("TERM", "alacritty"); // TERM supports colors. + EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. + SetEnv("TERM", "xterm-256color"); // TERM supports colors. EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. @@ -6695,7 +6698,7 @@ TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) { SetEnv("TERM", "linux"); // TERM supports colors. EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. - SetEnv("TERM", "cygwin"); // TERM supports colors. + SetEnv("TERM", "cygwin"); // TERM supports colors. EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. #endif // GTEST_OS_WINDOWS } |