summaryrefslogtreecommitdiffstats
path: root/extensions/shell
diff options
context:
space:
mode:
authordpranke <dpranke@chromium.org>2015-07-24 14:42:00 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-24 21:43:01 +0000
commita21b31b06bdb379fbaa9a77bb7db0535c3dc1b21 (patch)
tree0f7bacd868618664a37f3db793a54bf2b8559579 /extensions/shell
parent91c0df87e4b98d215ffad5f9ac9c66b9a1db31bf (diff)
downloadchromium_src-a21b31b06bdb379fbaa9a77bb7db0535c3dc1b21.zip
chromium_src-a21b31b06bdb379fbaa9a77bb7db0535c3dc1b21.tar.gz
chromium_src-a21b31b06bdb379fbaa9a77bb7db0535c3dc1b21.tar.bz2
Add more isolates to the GN build:
This patches adds the right data and data_deps annotations, and the buildbot mappings needed for: - app_list_unittests - app_shell_unittests (partially, there are issues still) - aura_unittests - cast_unittests - ui_touch_selection_unittests - wm_unittests R=brettw@chromium.org BUG=504079 CQ_EXTRA_TRYBOTS=tryserver.chromium.mac:mac_chromium_gn_rel Review URL: https://codereview.chromium.org/1246843003 Cr-Commit-Position: refs/heads/master@{#340341}
Diffstat (limited to 'extensions/shell')
-rw-r--r--extensions/shell/BUILD.gn22
1 files changed, 22 insertions, 0 deletions
diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn
index 3dad93d..0c99278 100644
--- a/extensions/shell/BUILD.gn
+++ b/extensions/shell/BUILD.gn
@@ -156,11 +156,28 @@ if (!(is_chromeos && !use_ozone)) {
}
}
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("app_shell_unittests_run") {
+ testonly = true
+ deps = [
+ ":app_shell_unittests",
+ ]
+}
+
test("app_shell_unittests") {
sources = rebase_path(app_shell_gypi_values.app_shell_unittests_sources,
".",
"//extensions/shell")
+ data = [
+ "//extensions/test/data/",
+ "$root_out_dir/extensions_shell_and_test.pak",
+
+ #"$root_out_dir/natives_blob.bin", # move to gin
+ #"$root_out_dir/snapshot_blob.bin",
+ ]
+
deps = [
":app_shell_lib",
"//base",
@@ -171,6 +188,11 @@ test("app_shell_unittests") {
"//testing/gtest",
]
+ data_deps = [
+ # "//gin", # TODO(dpranke): Either gin or v8 data is needed ...
+ "//third_party/mesa:osmesa",
+ ]
+
if (use_aura) {
deps += [ "//ui/aura:test_support" ]