diff --git a/starboard/evergreen/arm/shared/cobalt/configuration.py b/starboard/evergreen/arm/shared/cobalt/configuration.py index 67f8f5d00e6e..171ce39edd60 100644 --- a/starboard/evergreen/arm/shared/cobalt/configuration.py +++ b/starboard/evergreen/arm/shared/cobalt/configuration.py @@ -66,14 +66,4 @@ def GetTestEnvVariables(self): 'PixelTest.CircularSubPixelBorder', 'PixelTest.FilterBlurred100PxText', ], - # These unittest cases are failing after llvm rebase. They will be fixed - # and re-enabled. - 'base_unittests': [ - '*', - ], - # These unittest cases are failing after llvm rebase. They will be fixed - # and re-enabled. - 'net_unittests': [ - '*', - ], } diff --git a/starboard/evergreen/x64/cobalt/configuration.py b/starboard/evergreen/x64/cobalt/configuration.py index 5e7fe1346a20..5e03b4098943 100644 --- a/starboard/evergreen/x64/cobalt/configuration.py +++ b/starboard/evergreen/x64/cobalt/configuration.py @@ -39,15 +39,4 @@ def GetTestEnvVariables(self): } } - __FILTERED_TESTS = { # pylint: disable=invalid-name - # These unittest cases are failing after llvm rebase. They will be fixed - # and re-enabled. - 'base_unittests': [ - '*', - ], - # These unittest cases are failing after llvm rebase. They will be fixed - # and re-enabled. - 'net_unittests': [ - '*', - ], - } + __FILTERED_TESTS = {} # pylint: disable=invalid-name diff --git a/testing/gtest/include/gtest/internal/gtest-port.h b/testing/gtest/include/gtest/internal/gtest-port.h index b0ae9ed5a973..95b90070935b 100644 --- a/testing/gtest/include/gtest/internal/gtest-port.h +++ b/testing/gtest/include/gtest/internal/gtest-port.h @@ -1297,10 +1297,13 @@ class GTEST_API_ GTestLog { }; #if !defined(GTEST_LOG_) - +#if GTEST_OS_STARBOARD +#define GTEST_LOG_ SB_LOG +#else # define GTEST_LOG_(severity) \ ::testing::internal::GTestLog(::testing::internal::GTEST_##severity, \ __FILE__, __LINE__).GetStream() +#endif inline void LogToStderr() {} #if GTEST_OS_STARBOARD