summaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-base_test_test__suite.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/iridium/files/patch-base_test_test__suite.cc')
-rw-r--r--www/iridium/files/patch-base_test_test__suite.cc37
1 files changed, 0 insertions, 37 deletions
diff --git a/www/iridium/files/patch-base_test_test__suite.cc b/www/iridium/files/patch-base_test_test__suite.cc
deleted file mode 100644
index 74f7f01726cc..000000000000
--- a/www/iridium/files/patch-base_test_test__suite.cc
+++ /dev/null
@@ -1,37 +0,0 @@
---- base/test/test_suite.cc.orig 2020-03-23 15:30:45 UTC
-+++ base/test/test_suite.cc
-@@ -68,7 +68,7 @@
- #include "base/test/test_support_ios.h"
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "base/test/fontconfig_util_linux.h"
- #endif
-
-@@ -384,14 +384,14 @@ void TestSuite::PreInitialize() {
- testing::GTEST_FLAG(catch_exceptions) = false;
- #endif
- EnableTerminationOnHeapCorruption();
--#if defined(OS_LINUX) && defined(USE_AURA)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_AURA)
- // When calling native char conversion functions (e.g wrctomb) we need to
- // have the locale set. In the absence of such a call the "C" locale is the
- // default. In the gtk code (below) gtk_init() implicitly sets a locale.
- setlocale(LC_ALL, "");
- // We still need number to string conversions to be locale insensitive.
- setlocale(LC_NUMERIC, "C");
--#endif // defined(OS_LINUX) && defined(USE_AURA)
-+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_AURA)
-
- // On Android, AtExitManager is created in
- // testing/android/native_test_wrapper.cc before main() is called.
-@@ -620,7 +620,7 @@ void TestSuite::Initialize() {
- // TODO(jshin): Should we set the locale via an OS X locale API here?
- i18n::SetICUDefaultLocale("en_US");
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- SetUpFontconfig();
- #endif
-