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
38dd7485
Commit
38dd7485
authored
Jul 14, 2015
by
kosak
Browse files
Change GetDefaultFilter to allow for the injection of a custom filter.
parent
f025eba0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
+11
-0
include/gtest/internal/custom/gtest-port.h
include/gtest/internal/custom/gtest-port.h
+5
-0
src/gtest.cc
src/gtest.cc
+6
-0
No files found.
include/gtest/internal/custom/gtest-port.h
View file @
38dd7485
...
@@ -39,6 +39,11 @@
...
@@ -39,6 +39,11 @@
// GTEST_DEFINE_int32_(name, default_val, doc)
// GTEST_DEFINE_int32_(name, default_val, doc)
// GTEST_DEFINE_string_(name, default_val, doc)
// GTEST_DEFINE_string_(name, default_val, doc)
//
//
// Test filtering:
// GTEST_TEST_FILTER_ENV_VAR_ - The name of an environment variable that
// will be used if --GTEST_FLAG(test_filter)
// is not provided.
//
// Logging:
// Logging:
// GTEST_LOG_(severity)
// GTEST_LOG_(severity)
// GTEST_CHECK_(condition)
// GTEST_CHECK_(condition)
...
...
src/gtest.cc
View file @
38dd7485
...
@@ -189,6 +189,12 @@ bool g_help_flag = false;
...
@@ -189,6 +189,12 @@ bool g_help_flag = false;
}
// namespace internal
}
// namespace internal
static
const
char
*
GetDefaultFilter
()
{
static
const
char
*
GetDefaultFilter
()
{
#ifdef GTEST_TEST_FILTER_ENV_VAR_
const
char
*
const
testbridge_test_only
=
getenv
(
GTEST_TEST_FILTER_ENV_VAR_
);
if
(
testbridge_test_only
!=
NULL
)
{
return
testbridge_test_only
;
}
#endif // GTEST_TEST_FILTER_ENV_VAR_
return
kUniversalFilter
;
return
kUniversalFilter
;
}
}
...
...
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