Index: chrome/test/BUILD.gn |
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn |
index 735c8daea8f647ef0b6fd0d347bc209433fa0ea0..c45648d8edc86984cbde19c4cf6e77ed85fcb1f1 100644 |
--- a/chrome/test/BUILD.gn |
+++ b/chrome/test/BUILD.gn |
@@ -222,12 +222,54 @@ if (!is_android) { |
] |
} |
+ # TODO(GYP): Delete this after we've converted everything to GN. |
+ # The _run targets exist only for compatibility w/ GYP. |
+ group("interactive_ui_tests_run") { |
+ testonly = true |
+ deps = [ |
+ ":interactive_ui_tests", |
+ ] |
+ } |
+ |
test("interactive_ui_tests") { |
sources = |
rebase_path(chrome_tests_gypi_values.chrome_interactive_ui_test_sources, |
".", |
"//chrome") |
+ data = [ |
+ "//net/data/ssl/certificates/", |
+ "//net/tools/testserver/", |
+ "//ppapi/tests/test_case.html", |
+ "//ppapi/tests/test_case.html.mock-http-headers", |
+ "//ppapi/tests/test_page.css", |
+ "//ppapi/tests/test_page.css.mock-http-headers", |
+ "//third_party/pyftpdlib/", |
+ "//third_party/pywebsocket/", |
+ "//third_party/tlslite/", |
+ "//third_party/zlib/google/test/data/", |
+ "//tools/metrics/histograms/histograms.xml", |
+ "$root_out_dir/pyproto/google/", |
+ "$root_out_dir/resources.pak", |
+ "$root_out_dir/ui_test.pak", |
+ ] |
+ if (is_android || is_linux || is_win) { |
+ data += [ |
+ "$root_out_dir/chrome_100_percent.pak", |
+ "$root_out_dir/locales/en-US.pak", |
+ ] |
+ } |
+ if (is_linux) { |
+ data += [ "$root_out_dir/libppapi_tests.so" ] |
+ } |
+ if (is_linux || is_win) { |
+ data += [ |
+ "$root_out_dir/chrome_100_percent.pak", |
+ "$root_out_dir/locales/en-US.pak", |
M-A Ruel
2015/07/26 00:51:24
Why can't you depend on the targets?
Dirk Pranke
2015/07/26 17:52:53
There's a bug in GN where if something is listed a
|
+ "$root_out_dir/locales/fr.pak", |
+ ] |
+ } |
+ |
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] |
ldflags = [] |
@@ -267,7 +309,7 @@ if (!is_android) { |
deps += [ "//extensions:chrome_extensions_interactive_uitests" ] |
# Runtime dependencies |
- datadeps = [ |
+ data_deps = [ |
M-A Ruel
2015/07/26 00:51:24
So typos get undetected? :/
Dirk Pranke
2015/07/26 17:52:53
Both variables are currently supported by GN; data
|
"//ppapi:ppapi_tests", |
"//third_party/mesa:osmesa", |
] |
@@ -411,7 +453,7 @@ if (!is_android) { |
if (use_x11) { |
configs += [ "//build/config/linux:xtst" ] |
- datadeps += [ "//tools/xdisplaycheck" ] |
+ data_deps += [ "//tools/xdisplaycheck" ] |
} |
if (enable_app_list) { |
@@ -973,12 +1015,39 @@ if (!is_android) { |
} |
} |
+ # TODO(GYP): Delete this after we've converted everything to GN. |
+ # The _run targets exist only for compatibility w/ GYP. |
+ group("sync_integration_tests_run") { |
+ testonly = true |
+ deps = [ |
+ ":sync_integration_tests", |
+ ] |
+ } |
+ |
test("sync_integration_tests") { |
sources = |
rebase_path(chrome_tests_gypi_values.sync_integration_tests_sources, |
".", |
"//chrome") |
+ data = [ |
+ "//chrome/test/data/sync/", |
+ "//net/tools/testserver/", |
+ "//sync/tools/testserver/", |
+ "//third_party/pyftpdlib/", |
+ "//third_party/pywebsocket/", |
+ "//third_party/tlslite/", |
+ "$root_out_dir/pyproto/", |
+ "$root_out_dir/resources.pak", |
+ ] |
+ |
+ if (is_linux || is_win) { |
+ data += [ |
+ "$root_out_dir/chrome_100_percent.pak", |
+ "$root_out_dir/locales/en-US.pak", |
+ ] |
+ } |
+ |
# TODO(phajdan.jr): Only temporary, to make transition easier. |
defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] |
@@ -1001,6 +1070,8 @@ if (!is_android) { |
"//third_party/WebKit/public:blink", |
] |
+ data_deps = [ "//third_party/mesa:osmesa" ] |
+ |
if (cld_version == 0 || cld_version == 2) { |
# Language detection is irrelevant to sync, so it can depend on any |
# implementation for CLD2. Dynamic is smaller, so go with dynamic. |
@@ -1148,12 +1219,51 @@ if (!is_android) { |
} |
} |
+ # TODO(GYP): Delete this after we've converted everything to GN. |
+ # The _run targets exist only for compatibility w/ GYP. |
+ group("unit_tests_run") { |
+ testonly = true |
+ deps = [ |
+ ":unit_tests", |
+ ] |
+ } |
+ |
test("unit_tests") { |
sources = |
rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_sources, |
".", |
"//chrome") |
+ data = [ |
+ "data/", |
+ "//base/test/data/", |
+ "//chrome/third_party/mock4js/", |
+ "//components/test/data/", |
+ "//extensions/test/data/", |
+ "//google_apis/test/data/", |
+ "//net/data/", |
+ "//net/tools/testserver/", |
+ "//third_party/accessibility-audit/axs_testing.js", |
+ "//third_party/hunspell_dictionaries/", |
+ "//third_party/pyftpdlib/", |
+ "//third_party/pywebsocket/", |
+ "//third_party/tlslite/", |
+ "//third_party/zlib/google/test/data/", |
+ "//tools/metrics/histograms/histograms.xml", |
+ "$root_out_dir/pyproto/google/", |
+ "$root_out_dir/test_data/chrome/browser/resources/google_now/", |
+ "$root_out_dir/test_data/chrome/browser/resources/print_preview/", |
+ "$root_out_dir/test_data/chrome/renderer/resources/extensions/", |
+ "$root_out_dir/test_data/ui/webui/", |
+ "$root_out_dir/resources.pak", |
+ ] |
+ if (is_android || is_linux || is_win) { |
+ data += [ |
+ "$root_out_dir/chrome_100_percent.pak", |
+ "$root_out_dir/locales/en-US.pak", |
+ ] |
+ } |
+ |
defines = [] |
deps = [ |