Remove bionic test's dependency on gtest internal.
It is wrong to depend on internal ABI. And in the new version, they
explicitly disabled that.
https://github.com/google/googletest/commit/b3d9be5c1d969dfdbf1f1ff924b9fd1be5eaecc9
Test: run test
Change-Id: I194a1e9417df2c52872b6eca6b61fb392e07cd29
diff --git a/tests/gtest_main.cpp b/tests/gtest_main.cpp
index 6f8c403..1ee8b53 100644
--- a/tests/gtest_main.cpp
+++ b/tests/gtest_main.cpp
@@ -73,27 +73,21 @@
return g_envp;
}
-namespace testing {
-namespace internal {
+static constexpr const char* COLOR_RESET = "\033[m";
+static constexpr const char* COLOR_RED = "\033[0;31m";
+static constexpr const char* COLOR_GREEN = "\033[0;32m";
+static constexpr const char* COLOR_YELLOW = "\033[0;33m";
-// Reuse of testing::internal::ColoredPrintf in gtest.
-enum GTestColor {
- COLOR_DEFAULT,
- COLOR_RED,
- COLOR_GREEN,
- COLOR_YELLOW
-};
+static void ColoredPrintf(const char* const color, const char* fmt, ...) {
+ va_list args;
+ va_start(args, fmt);
-void ColoredPrintf(GTestColor color, const char* fmt, ...);
+ printf("%s", color);
+ vprintf(fmt, args);
+ printf("%s", COLOR_RESET);
-} // namespace internal
-} // namespace testing
-
-using testing::internal::GTestColor;
-using testing::internal::COLOR_RED;
-using testing::internal::COLOR_GREEN;
-using testing::internal::COLOR_YELLOW;
-using testing::internal::ColoredPrintf;
+ va_end(args);
+}
constexpr int DEFAULT_GLOBAL_TEST_RUN_DEADLINE_MS = 90000;
constexpr int DEFAULT_GLOBAL_TEST_RUN_SLOW_THRESHOLD_MS = 2000;