Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
340c6b33
Commit
340c6b33
authored
Jan 31, 2016
by
Joongi Kim
Browse files
Add tmux and tmux-256color to the colored terminal list.
parent
82b11b8c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
googletest/src/gtest.cc
googletest/src/gtest.cc
+2
-0
googletest/test/gtest_unittest.cc
googletest/test/gtest_unittest.cc
+6
-0
No files found.
googletest/src/gtest.cc
View file @
340c6b33
...
@@ -2930,6 +2930,8 @@ bool ShouldUseColor(bool stdout_is_tty) {
...
@@ -2930,6 +2930,8 @@ bool ShouldUseColor(bool stdout_is_tty) {
String
::
CStringEquals
(
term
,
"xterm-256color"
)
||
String
::
CStringEquals
(
term
,
"xterm-256color"
)
||
String
::
CStringEquals
(
term
,
"screen"
)
||
String
::
CStringEquals
(
term
,
"screen"
)
||
String
::
CStringEquals
(
term
,
"screen-256color"
)
||
String
::
CStringEquals
(
term
,
"screen-256color"
)
||
String
::
CStringEquals
(
term
,
"tmux"
)
||
String
::
CStringEquals
(
term
,
"tmux-256color"
)
||
String
::
CStringEquals
(
term
,
"rxvt-unicode"
)
||
String
::
CStringEquals
(
term
,
"rxvt-unicode"
)
||
String
::
CStringEquals
(
term
,
"rxvt-unicode-256color"
)
||
String
::
CStringEquals
(
term
,
"rxvt-unicode-256color"
)
||
String
::
CStringEquals
(
term
,
"linux"
)
||
String
::
CStringEquals
(
term
,
"linux"
)
||
...
...
googletest/test/gtest_unittest.cc
View file @
340c6b33
...
@@ -6840,6 +6840,12 @@ TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) {
...
@@ -6840,6 +6840,12 @@ TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) {
SetEnv
(
"TERM"
,
"screen-256color"
);
// TERM supports colors.
SetEnv
(
"TERM"
,
"screen-256color"
);
// TERM supports colors.
EXPECT_TRUE
(
ShouldUseColor
(
true
));
// Stdout is a TTY.
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.
SetEnv
(
"TERM"
,
"rxvt-unicode"
);
// TERM supports colors.
EXPECT_TRUE
(
ShouldUseColor
(
true
));
// Stdout is a TTY.
EXPECT_TRUE
(
ShouldUseColor
(
true
));
// Stdout is a TTY.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment