diff options
| -rw-r--r-- | BUILD.gn | 4 | ||||
| -rw-r--r-- | testing/buildbot/gn_isolate_map.pyl | 8 | ||||
| -rw-r--r-- | third_party/WebKit/Source/platform/BUILD.gn | 6 | ||||
| -rw-r--r-- | third_party/WebKit/public/BUILD.gn | 8 |
4 files changed, 12 insertions, 14 deletions
@@ -185,8 +185,8 @@ group("both_gn_and_gyp") { #"//mojo/edk/test:mojo_public_environment_unittests", #"//mojo/edk/test:mojo_public_system_unittests", #"//mojo/edk/test:mojo_public_utility_unittests", - "//third_party/WebKit/Source/platform:heap_unittests", - "//third_party/WebKit/Source/platform:platform_unittests", + "//third_party/WebKit/Source/platform:blink_heap_unittests", + "//third_party/WebKit/Source/platform:blink_platform_unittests", "//third_party/WebKit/Source/web:webkit_unit_tests", "//third_party/WebKit/Source/wtf:wtf_unittests", "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests", diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl index 95503bb..ef2a219 100644 --- a/testing/buildbot/gn_isolate_map.pyl +++ b/testing/buildbot/gn_isolate_map.pyl @@ -73,12 +73,12 @@ "type": "console_test_launcher", }, "blink_heap_unittests": { - "label": "//third_party/WebKit/public:blink_heap_unittests", - "type": "unknown", + "label": "//third_party/WebKit/Source/platform:blink_heap_unittests", + "type": "console_test_launcher", }, "blink_platform_unittests": { - "label": "//third_party/WebKit/public:blink_platform_unittests", - "type": "unknown", + "label": "//third_party/WebKit/Source/platform:blink_platform_unittests", + "type": "console_test_launcher", }, "breakpad_unittests": { "label": "//breakpad:breakpad_unittests", diff --git a/third_party/WebKit/Source/platform/BUILD.gn b/third_party/WebKit/Source/platform/BUILD.gn index 1242951..6da7207 100644 --- a/third_party/WebKit/Source/platform/BUILD.gn +++ b/third_party/WebKit/Source/platform/BUILD.gn @@ -336,10 +336,9 @@ source_set("test_support") { } # GYP: blink_heap_unittests -test("heap_unittests") { +test("blink_heap_unittests") { visibility = [] # Allow re-assignment of list. visibility = [ "*" ] - output_name = "blink_heap_unittests" sources = rebase_path(heap_gypi.platform_heap_test_files, ".", "heap") sources += [ "heap/RunAllTests.cpp" ] @@ -371,10 +370,9 @@ test("heap_unittests") { } } -test("platform_unittests") { +test("blink_platform_unittests") { visibility = [] # Allow re-assignment of list. visibility = [ "*" ] - output_name = "blink_platform_unittests" sources = platform_test_files diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn index dde23d0..c605ad1 100644 --- a/third_party/WebKit/public/BUILD.gn +++ b/third_party/WebKit/public/BUILD.gn @@ -51,8 +51,8 @@ group("all_blink") { public_deps = [ "//third_party/WebKit/Source/core", "//third_party/WebKit/Source/modules", - "//third_party/WebKit/Source/platform:heap_unittests", - "//third_party/WebKit/Source/platform:platform_unittests", + "//third_party/WebKit/Source/platform:blink_heap_unittests", + "//third_party/WebKit/Source/platform:blink_platform_unittests", "//third_party/WebKit/Source/web", "//third_party/WebKit/Source/web:webkit_unit_tests", "//third_party/WebKit/Source/wtf:wtf_unittests", @@ -61,8 +61,8 @@ group("all_blink") { if (is_mac) { # TODO(GYP): Re-enable this as soon as we can link Blink binaries on mac. public_deps -= [ - "//third_party/WebKit/Source/platform:heap_unittests", - "//third_party/WebKit/Source/platform:platform_unittests", + "//third_party/WebKit/Source/platform:blink_heap_unittests", + "//third_party/WebKit/Source/platform:blink_platform_unittests", "//third_party/WebKit/Source/web:webkit_unit_tests", ] } |