From 340c6b337518d8d78c25b84375ca992351d994aa Mon Sep 17 00:00:00 2001 From: Joongi Kim Date: Sun, 31 Jan 2016 17:24:31 +0900 Subject: [PATCH] Add tmux and tmux-256color to the colored terminal list. --- googletest/src/gtest.cc | 2 ++ googletest/test/gtest_unittest.cc | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 4170e5c7..2bac245d 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -2930,6 +2930,8 @@ bool ShouldUseColor(bool stdout_is_tty) { String::CStringEquals(term, "xterm-256color") || String::CStringEquals(term, "screen") || String::CStringEquals(term, "screen-256color") || + String::CStringEquals(term, "tmux") || + String::CStringEquals(term, "tmux-256color") || String::CStringEquals(term, "rxvt-unicode") || String::CStringEquals(term, "rxvt-unicode-256color") || String::CStringEquals(term, "linux") || diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 60aed357..355252fc 100644 --- a/googletest/test/gtest_unittest.cc +++ b/googletest/test/gtest_unittest.cc @@ -6840,6 +6840,12 @@ TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) { SetEnv("TERM", "screen-256color"); // TERM supports colors. EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. + SetEnv("TERM", "tmux"); // TERM supports colors. + EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. + + SetEnv("TERM", "tmux-256color"); // TERM supports colors. + EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY. + SetEnv("TERM", "rxvt-unicode"); // TERM supports colors. EXPECT_TRUE(ShouldUseColor(true)); // Stdout is a TTY.