mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: fix :electron_tests compilation

Browse source
This commit is contained in:
Aleksei Kuzmin 2018-09-20 21:03:48 +02:00
parent aafe83338c
commit 6ab5c2faa1
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
patches/common/chromium/.patches.yaml
View file

@ -442,8 +442,8 @@ patches:
author: Aleksei Kuzmin <alkuzmin@microsoft.com> author: Aleksei Kuzmin <alkuzmin@microsoft.com>
file: exclude-a-few-test-files-from-build.patch file: exclude-a-few-test-files-from-build.patch
description: | description: |
Compilation of those files fails with the Chromium 67. Compilation of those files fails with the Chromium 68.
Remove the patch during the Chromium 68 upgrade. Remove the patch during the Chromium 69 upgrade.
- -
author: deepak1556 <hop2deep@gmail.com> author: deepak1556 <hop2deep@gmail.com>
file: disable_extensions_gn.patch file: disable_extensions_gn.patch

32
patches/common/chromium/exclude-a-few-test-files-from-build.patch
View file

@ -1,22 +1,22 @@
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index 9173f6f0324c..8f976057d5d9 100644 index 05177001104e..5b5e00e9ef2d 100644
--- a/third_party/blink/renderer/platform/BUILD.gn --- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/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") { @@ -1797,7 +1797,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/chunk_to_layer_mapper_test.cc",
- "graphics/compositing/composited_layer_raster_invalidator_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_artifact_compositor_test.cc",
"graphics/compositing/paint_chunks_to_cc_layer_test.cc", - "graphics/compositing/paint_chunks_to_cc_layer_test.cc",
+ # "graphics/compositing/paint_chunks_to_cc_layer_test.cc",
"graphics/compositor_element_id_test.cc", "graphics/compositor_element_id_test.cc",
@@ -1839,7 +1839,7 @@ jumbo_source_set("blink_platform_unittests_sources") { "graphics/contiguous_container_test.cc",
"graphics/paint/drawing_display_item_test.cc", "graphics/decoding_image_generator_test.cc",
"graphics/paint/drawing_recorder_test.cc", @@ -1873,7 +1873,7 @@ jumbo_source_set("blink_platform_unittests_sources") {
"graphics/paint/float_clip_rect_test.cc", "text/date_time_format_test.cc",
- "graphics/paint/geometry_mapper_test.cc", "text/hyphenation_test.cc",
+ #"graphics/paint/geometry_mapper_test.cc", "text/icu_error_test.cc",
"graphics/paint/paint_chunk_test.cc", - "text/line_ending_test.cc",
"graphics/paint/paint_chunker_test.cc", + # "text/line_ending_test.cc",
"graphics/paint/paint_controller_test.cc", "text/platform_locale_test.cc",
"text/segmented_string_test.cc",
"text/suffix_tree_test.cc",