From 38dd7485c0bec2720c75789f26f5d549e9b4a541 Mon Sep 17 00:00:00 2001 From: kosak Date: Tue, 14 Jul 2015 21:49:27 +0000 Subject: [PATCH] Change GetDefaultFilter to allow for the injection of a custom filter. --- include/gtest/internal/custom/gtest-port.h | 5 +++++ src/gtest.cc | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/include/gtest/internal/custom/gtest-port.h b/include/gtest/internal/custom/gtest-port.h index 3083b8e0..b31810da 100644 --- a/include/gtest/internal/custom/gtest-port.h +++ b/include/gtest/internal/custom/gtest-port.h @@ -39,6 +39,11 @@ // GTEST_DEFINE_int32_(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: // GTEST_LOG_(severity) // GTEST_CHECK_(condition) diff --git a/src/gtest.cc b/src/gtest.cc index 8b767074..6dea6c6a 100644 --- a/src/gtest.cc +++ b/src/gtest.cc @@ -189,6 +189,12 @@ bool g_help_flag = false; } // namespace internal 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; }