From a314a15ecda2b0a29a0d4e3453636f54317491c1 Mon Sep 17 00:00:00 2001 From: Alexey Kuzmin Date: Sat, 15 Sep 2018 00:11:26 +0200 Subject: [PATCH] tests: fix compilation of blink_unittests (#14574) --- patches/common/chromium/.patches.yaml | 6 +++++ .../exclude-a-few-test-files-from-build.patch | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 patches/common/chromium/exclude-a-few-test-files-from-build.patch diff --git a/patches/common/chromium/.patches.yaml b/patches/common/chromium/.patches.yaml index 19ef8222e2dd..03a7dd41c079 100644 --- a/patches/common/chromium/.patches.yaml +++ b/patches/common/chromium/.patches.yaml @@ -466,3 +466,9 @@ patches: Fix conflict between leveldb & node's definition of ssize_t on Windows by preventing leveldb from re-defining the type if it's already defined. +- + author: Aleksei Kuzmin + file: exclude-a-few-test-files-from-build.patch + description: | + Compilation of those files fails with the Chromium 67. + Remove the patch during the Chromium 68 upgrade. diff --git a/patches/common/chromium/exclude-a-few-test-files-from-build.patch b/patches/common/chromium/exclude-a-few-test-files-from-build.patch new file mode 100644 index 000000000000..6c4e1a61beec --- /dev/null +++ b/patches/common/chromium/exclude-a-few-test-files-from-build.patch @@ -0,0 +1,22 @@ +diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn +index 9173f6f0324c..8f976057d5d9 100644 +--- a/third_party/blink/renderer/platform/BUILD.gn ++++ b/third_party/blink/renderer/platform/BUILD.gn +@@ -1819,7 +1819,7 @@ jumbo_source_set("blink_platform_unittests_sources") { + "graphics/accelerated_static_bitmap_image_test.cc", + "graphics/bitmap_image_test.cc", + "graphics/compositing/chunk_to_layer_mapper_test.cc", +- "graphics/compositing/composited_layer_raster_invalidator_test.cc", ++ #"graphics/compositing/composited_layer_raster_invalidator_test.cc", + "graphics/compositing/paint_artifact_compositor_test.cc", + "graphics/compositing/paint_chunks_to_cc_layer_test.cc", + "graphics/compositor_element_id_test.cc", +@@ -1839,7 +1839,7 @@ jumbo_source_set("blink_platform_unittests_sources") { + "graphics/paint/drawing_display_item_test.cc", + "graphics/paint/drawing_recorder_test.cc", + "graphics/paint/float_clip_rect_test.cc", +- "graphics/paint/geometry_mapper_test.cc", ++ #"graphics/paint/geometry_mapper_test.cc", + "graphics/paint/paint_chunk_test.cc", + "graphics/paint/paint_chunker_test.cc", + "graphics/paint/paint_controller_test.cc",