Commit 5b595f68 authored by brettw's avatar brettw Committed by Commit bot

Disable more GN linking on Windows.

Bots are still too slow.

TBR=dpranke

Review URL: https://codereview.chromium.org/889203002

Cr-Commit-Position: refs/heads/master@{#314094}
parent ba683620
...@@ -71,7 +71,7 @@ component("blink") { ...@@ -71,7 +71,7 @@ component("blink") {
# GYP version: //cc/blink/cc_blink_tests.gyp:cc_blink_unittests # GYP version: //cc/blink/cc_blink_tests.gyp:cc_blink_unittests
# TODO(GYP): make linking work on the mac. # TODO(GYP): make linking work on the mac.
if (!is_mac) { if (!is_mac && (!is_win || link_chrome_on_windows)) {
test("cc_blink_unittests") { test("cc_blink_unittests") {
sources = [ sources = [
"web_animation_unittest.cc", "web_animation_unittest.cc",
......
...@@ -217,7 +217,8 @@ group("all_components") { ...@@ -217,7 +217,8 @@ group("all_components") {
# component (it's important to use a source_set instead of a static library or # component (it's important to use a source_set instead of a static library or
# no tests will run) and add a reference here. You can add more than one unit # no tests will run) and add a reference here. You can add more than one unit
# test target if convenient. # test target if convenient.
test("components_unittests") { if (!is_win || link_chrome_on_windows) {
test("components_unittests") {
sources = [ sources = [
"test/run_all_unittests.cc", "test/run_all_unittests.cc",
] ]
...@@ -274,4 +275,5 @@ test("components_unittests") { ...@@ -274,4 +275,5 @@ test("components_unittests") {
if (is_win) { if (is_win) {
deps += [ "//components/browser_watcher:unit_tests" ] deps += [ "//components/browser_watcher:unit_tests" ]
} }
}
} }
...@@ -246,7 +246,7 @@ if (!is_ios) { ...@@ -246,7 +246,7 @@ if (!is_ios) {
} # !is_ios } # !is_ios
# TODO(GYP) enable content_browsertests on Mac when it links. # TODO(GYP) enable content_browsertests on Mac when it links.
if (!is_mac) { if (!is_mac && (!is_win || link_chrome_on_windows)) {
test("content_browsertests") { test("content_browsertests") {
sources = sources =
rebase_path(content_tests_gypi_values.content_browsertests_sources, rebase_path(content_tests_gypi_values.content_browsertests_sources,
...@@ -429,7 +429,7 @@ if (!is_mac) { ...@@ -429,7 +429,7 @@ if (!is_mac) {
} }
} }
if (!is_mac) { # TODO(GYP) enable on Mac once it links. if (!is_mac && (!is_win || link_chrome_on_windows)) { # TODO(GYP) enable on Mac once it links.
test("content_unittests") { test("content_unittests") {
sources = rebase_path(content_tests_gypi_values.content_unittests_sources, sources = rebase_path(content_tests_gypi_values.content_unittests_sources,
".", ".",
...@@ -622,7 +622,7 @@ if (!is_mac) { # TODO(GYP) enable on Mac once it links. ...@@ -622,7 +622,7 @@ if (!is_mac) { # TODO(GYP) enable on Mac once it links.
} }
} }
if (!is_mac) { # TODO(GYP) enable on Mac once it links. if (!is_mac && (!is_win || link_chrome_on_windows)) { # TODO(GYP) enable on Mac once it links.
test("content_perftests") { test("content_perftests") {
sources = [ sources = [
"../browser/renderer_host/input/input_router_impl_perftest.cc", "../browser/renderer_host/input/input_router_impl_perftest.cc",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment