mirror of
https://git.freebsd.org/ports.git
synced 2025-06-20 04:00:41 -04:00
d90bf58cf8
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
18 lines
890 B
C++
18 lines
890 B
C++
--- content/test/content_test_suite.cc.orig 2019-03-11 22:00:58 UTC
|
|
+++ content/test/content_test_suite.cc
|
|
@@ -85,6 +85,7 @@ void ContentTestSuite::Initialize() {
|
|
// to initialize GL, so don't do it here.
|
|
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
|
|
bool is_child_process = command_line->HasSwitch(switches::kTestChildProcess);
|
|
+#if !defined(OS_BSD)
|
|
if (!is_child_process) {
|
|
gl::GLSurfaceTestSupport::InitializeNoExtensionsOneOff();
|
|
auto* gpu_feature_info = gpu::GetTestGpuThreadHolder()->GetGpuFeatureInfo();
|
|
@@ -92,6 +93,7 @@ void ContentTestSuite::Initialize() {
|
|
gpu_feature_info->disabled_extensions);
|
|
gl::init::InitializeExtensionSettingsOneOffPlatform();
|
|
}
|
|
+#endif
|
|
testing::TestEventListeners& listeners =
|
|
testing::UnitTest::GetInstance()->listeners();
|
|
listeners.Append(new TestInitializationListener);
|