diff options
author | thakis <thakis@chromium.org> | 2016-02-16 14:42:29 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-16 22:44:35 +0000 |
commit | 5cba4757d28e7b73a965c5d23d04c097a6c4d90d (patch) | |
tree | 85461f4efc2fc5064ffb070346f1f2a4791f5934 /chrome_elf | |
parent | 25d5918b7dea34ddd4bf6ee4a221c902201644c0 (diff) | |
download | chromium_src-5cba4757d28e7b73a965c5d23d04c097a6c4d90d.zip chromium_src-5cba4757d28e7b73a965c5d23d04c097a6c4d90d.tar.gz chromium_src-5cba4757d28e7b73a965c5d23d04c097a6c4d90d.tar.bz2 |
gn/win: Try to get chrome_elf_unittests passing on swarming.
It looks like the indirection in chrome/BUILD.gn that does the
out/foo/initial/chrome.exe -> out/foo/chrome.exe mananges to
confuse data_deps, so add an explicit data dep.
Follow-up to https://codereview.chromium.org/1223703002/
BUG=98637,536192
TBR=caitkp
Review URL: https://codereview.chromium.org/1701053002
Cr-Commit-Position: refs/heads/master@{#375689}
Diffstat (limited to 'chrome_elf')
-rw-r--r-- | chrome_elf/BUILD.gn | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome_elf/BUILD.gn b/chrome_elf/BUILD.gn index d251a10..218c224 100644 --- a/chrome_elf/BUILD.gn +++ b/chrome_elf/BUILD.gn @@ -137,16 +137,24 @@ test("chrome_elf_unittests") { "//base", "//base/test:run_all_unittests", "//base/test:test_support", + "//chrome", "//chrome/common:version_header", "//sandbox", "//testing/gtest", ] + + # It's not easily possible to have //chrome in data_deps without changing + # the //chrome target to bundle up both initial/chrome.exe and chrome.exe. + # As a workaround, explicitly include a data dep on just chrome.exe, and + # add //chrome to deps above to make sure it's been built. + data = [ + "$root_out_dir/chrome.exe", + ] data_deps = [ ":blacklist_test_dll_1", ":blacklist_test_dll_2", ":blacklist_test_dll_3", ":chrome_elf", - "//chrome", ] } |