summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-11-23 12:41:08 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-23 20:42:55 +0000
commit13082723eca36efd15895d77b5bb099aa80257ba (patch)
treeb35ac9e62db9f9126f50ea5758bffe142befc62d /testing
parent8d22d29bfd0c021dd3d12eeff1369f34f6f8dd15 (diff)
downloadchromium_src-13082723eca36efd15895d77b5bb099aa80257ba.zip
chromium_src-13082723eca36efd15895d77b5bb099aa80257ba.tar.gz
chromium_src-13082723eca36efd15895d77b5bb099aa80257ba.tar.bz2
Moves components/mus/examples into mash
BUG=none TEST=none R=ben@chromium.org Review URL: https://codereview.chromium.org/1469733004 Cr-Commit-Position: refs/heads/master@{#361177}
Diffstat (limited to 'testing')
-rw-r--r--testing/buildbot/chromium.linux.json8
-rw-r--r--testing/buildbot/chromium.win.json4
-rw-r--r--testing/buildbot/gn_isolate_map.pyl4
3 files changed, 8 insertions, 8 deletions
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index a1959fe..df07c80 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -301,8 +301,8 @@
"Linux Builder": {
"additional_compile_targets": [
"blimp",
- "components/mus/example:all",
"mandoline:all",
+ "mash:all",
"remoting_all"
]
},
@@ -504,6 +504,9 @@
"test": "jingle_unittests"
},
{
+ "test": "mash_unittests"
+ },
+ {
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -570,9 +573,6 @@
"test": "mojo_view_manager_lib_unittests"
},
{
- "test": "mustash_unittests"
- },
- {
"swarming": {
"can_use_on_swarming_builders": true
},
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index 643b3c8..265064f 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -1558,7 +1558,6 @@
"chromedriver_unittests",
"components_browsertests",
"components_unittests",
- "components/mus/example:all",
"compositor_unittests",
"content_unittests",
"courgette_unittests",
@@ -1576,6 +1575,7 @@
"jingle_unittests",
"keyboard_unittests",
"mandoline:all",
+ "mash:all",
"media_unittests",
"media_blink_unittests",
"message_center_unittests",
@@ -1641,7 +1641,7 @@
"test": "mojo_view_manager_lib_unittests"
},
{
- "test": "mustash_unittests"
+ "test": "mash_unittests"
},
{
"test": "resource_provider_unittests"
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index 07fa7f6..101404a 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl
@@ -308,8 +308,8 @@
"label": "//ui/message_center:message_center_unittests",
"type": "unknown",
},
- "mustash_unittests": {
- "label": "//components/mus/example:mustash_unittests",
+ "mash_unittests": {
+ "label": "//mash:mash_unittests",
"type": "unknown",
},
"nacl_loader_unittests": {