Commit bb78b675 authored by John Abd-El-Malek's avatar John Abd-El-Malek

Swarm ash_unittests.

On Debug ChromeOS bot, this takes 5 minutes.

BUG=414808
TBR=sky

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

Cr-Commit-Position: refs/heads/master@{#297183}
parent 14c66460
...@@ -1274,4 +1274,24 @@ ...@@ -1274,4 +1274,24 @@
], ],
}, },
], ],
'conditions': [
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'ash_unittests_run',
'type': 'none',
'dependencies': [
'ash_unittests',
],
'includes': [
'../build/isolate.gypi',
'ash_unittests.isolate',
],
'sources': [
'ash_unittests.isolate',
],
},
],
}],
],
} }
# Copyright (c) 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'conditions': [
['OS=="win" or OS=="linux"', {
'variables': {
'isolate_dependency_tracked': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/ash_unittests<(EXECUTABLE_SUFFIX)',
'<(PRODUCT_DIR)/chrome_100_percent.pak',
'<(PRODUCT_DIR)/chrome_200_percent.pak',
'<(PRODUCT_DIR)/locales/en-US.pak',
'<(PRODUCT_DIR)/keyboard_resources.pak',
],
},
}],
['OS=="linux"', {
'variables': {
'command': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)',
'<(PRODUCT_DIR)/ash_unittests',
'--test-launcher-bot-mode',
],
'isolate_dependency_tracked': [
'../testing/xvfb.py',
'<(PRODUCT_DIR)/libffmpegsumo.so',
'<(PRODUCT_DIR)/libosmesa.so',
],
},
}],
['OS=="linux" and use_ozone==0', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
],
},
}],
['OS=="win"', {
'variables': {
'command': [
'../testing/test_env.py',
'<(PRODUCT_DIR)/ash_unittests.exe',
'--test-launcher-bot-mode',
],
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/ffmpegsumo.dll',
'<(PRODUCT_DIR)/osmesa.dll',
],
},
}],
['OS=="win" and (fastbuild==0 or fastbuild==1)', {
'variables': {
'isolate_dependency_untracked': [
'<(PRODUCT_DIR)/ash_unittests.exe.pdb',
],
},
}],
],
'includes': [
'../base/base.isolate',
],
}
...@@ -62,7 +62,12 @@ ...@@ -62,7 +62,12 @@
"views_unittests", "views_unittests",
"wm_unittests", "wm_unittests",
"aura_unittests", "aura_unittests",
"ash_unittests", {
"test": "ash_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"app_list_unittests", "app_list_unittests",
"message_center_unittests", "message_center_unittests",
"compositor_unittests", "compositor_unittests",
...@@ -173,7 +178,12 @@ ...@@ -173,7 +178,12 @@
"views_unittests", "views_unittests",
"wm_unittests", "wm_unittests",
"aura_unittests", "aura_unittests",
"ash_unittests", {
"test": "ash_unittests",
"swarming": {
"can_use_on_swarming_builders": true
}
},
"app_list_unittests", "app_list_unittests",
"message_center_unittests", "message_center_unittests",
"compositor_unittests", "compositor_unittests",
......
...@@ -5,6 +5,20 @@ ...@@ -5,6 +5,20 @@
"gtest_tests": [ "gtest_tests": [
"accessibility_unittests", "accessibility_unittests",
"app_list_unittests", "app_list_unittests",
{
"test": "ash_unittests",
"chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"],
"swarming": {
"can_use_on_swarming_builders": true
}
},
{
"test": "ash_unittests",
"platforms": ["win"],
"swarming": {
"can_use_on_swarming_builders": true
}
},
{ {
"test": "base_unittests", "test": "base_unittests",
"swarming": { "swarming": {
...@@ -158,14 +172,6 @@ ...@@ -158,14 +172,6 @@
"test": "app_shell_browsertests", "test": "app_shell_browsertests",
"platforms": ["linux"] "platforms": ["linux"]
}, },
{
"test": "ash_unittests",
"chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
},
{
"test": "ash_unittests",
"platforms": ["win"]
},
{ {
"test": "aura_unittests", "test": "aura_unittests",
"platforms": ["linux", "win"] "platforms": ["linux", "win"]
......
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