Skip to content

GitLab

T
tangled
Commit d34eb410 authored by maruel@chromium.org's avatar maruel@chromium.org
Browse files
Options

Remove target chromium_swarm_tests when test_isolate_mode == noop. 

This is the default value. It can be overridden with GYP_DEFINES. It is with
the swarm master.
Also remove the corresponding XXX_run targets. These can be problematic when
developers are moving files around, especially with DEPS rolls.
This simplifies build slave management during the deployment as the .isolate
files are being rolled out.

TBR=cmp@chromium.org
NOTRY=true
BUG=139426

Review URL: https://chromiumcodereview.appspot.com/10828061

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148854 0039d316-1c4b-4281-b951-d872f2087c98
parent 04b463fc
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 154 deletions
base/base.gyp
View file @ d34eb410
......@@ -731,38 +731,6 @@
'test/values_test_util.h',
],
},
{
'target_name': 'base_unittests_run',
'type': 'none',
'dependencies': [
'base_unittests',
],
'includes': [
'base_unittests.isolate',
],
'actions': [
{
'action_name': 'isolate',
'inputs': [
'base_unittests.isolate',
'<@(isolate_dependency_tracked)',
],
'outputs': [
'<(PRODUCT_DIR)/base_unittests.results',
],
'action': [
'python',
'../tools/isolate/isolate.py',
'<(test_isolation_mode)',
'--outdir', '<(test_isolation_outdir)',
'--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
'--variable', 'OS', '<(OS)',
'--result', '<@(_outputs)',
'--isolate', 'base_unittests.isolate',
],
},
],
},
{
'target_name': 'test_support_perf',
'type': 'static_library',
......@@ -1022,5 +990,41 @@
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'base_unittests_run',
'type': 'none',
'dependencies': [
'base_unittests',
],
'includes': [
'base_unittests.isolate',
],
'actions': [
{
'action_name': 'isolate',
'inputs': [
'base_unittests.isolate',
'<@(isolate_dependency_tracked)',
],
'outputs': [
'<(PRODUCT_DIR)/base_unittests.results',
],
'action': [
'python',
'../tools/isolate/isolate.py',
'<(test_isolation_mode)',
'--outdir', '<(test_isolation_outdir)',
'--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
'--variable', 'OS', '<(OS)',
'--result', '<@(_outputs)',
'--isolate', 'base_unittests.isolate',
],
},
],
},
],
}],
],
}
build/all.gyp
View file @ d34eb410
......@@ -177,27 +177,6 @@
],
],
}, # target_name: All_syzygy
{
'target_name': 'chromium_swarm_tests',
'type': 'none',
'dependencies': [
# Add new dependencies to the !ios section just below, not here (see
# the comment there).
],
'conditions': [
['OS!="ios"', {
'dependencies': [
# TODO(ios): This is temporary; currently almost nothing builds with
# OS=ios. Move dependencies back to the main dependencies section
# above as gyp files come online.
'../base/base.gyp:base_unittests_run',
'../chrome/chrome.gyp:browser_tests_run',
'../chrome/chrome.gyp:unit_tests_run',
'../net/net.gyp:net_unittests_run',
],
}],
],
}, # target_name: chromium_swarm_tests
{
'target_name': 'chromium_builder_tests',
'type': 'none',
......@@ -695,5 +674,19 @@
},
], # targets
}], # "use_aura==1"
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'chromium_swarm_tests',
'type': 'none',
'dependencies': [
'../base/base.gyp:base_unittests_run',
'../chrome/chrome.gyp:browser_tests_run',
'../chrome/chrome.gyp:unit_tests_run',
'../net/net.gyp:net_unittests_run',
],
}, # target_name: chromium_swarm_tests
],
}],
], # conditions
}
chrome/chrome_tests.gypi
View file @ d34eb410
......@@ -2563,37 +2563,6 @@
}],
],
},
{
'target_name': 'unit_tests_run',
'type': 'none',
'dependencies': [
'unit_tests',
],
'includes': [
'unit_tests.isolate',
],
'actions': [
{
'action_name': 'isolate',
'inputs': [
'<@(isolate_dependency_tracked)',
],
'outputs': [
'<(PRODUCT_DIR)/unit_tests.results',
],
'action': [
'python',
'../tools/isolate/isolate.py',
'<(test_isolation_mode)',
'--outdir', '<(test_isolation_outdir)',
'--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
'--variable', 'OS', '<(OS)',
'--result', '<@(_outputs)',
'--isolate', 'unit_tests.isolate',
],
},
],
},
{
# Executable that runs each browser test in a new process.
'target_name': 'browser_tests',
......@@ -3313,37 +3282,6 @@
}],
], # conditions
}, # target browser_tests
{
'target_name': 'browser_tests_run',
'type': 'none',
'dependencies': [
'browser_tests',
],
'includes': [
'browser_tests.isolate',
],
'actions': [
{
'action_name': 'isolate',
'inputs': [
'<@(isolate_dependency_tracked)',
],
'outputs': [
'<(PRODUCT_DIR)/browser_tests.results',
],
'action': [
'python',
'../tools/isolate/isolate.py',
'<(test_isolation_mode)',
'--outdir', '<(test_isolation_outdir)',
'--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
'--variable', 'OS', '<(OS)',
'--result', '<@(_outputs)',
'--isolate', 'browser_tests.isolate',
],
},
],
},
{
# Executable that runs each perf browser test in a new process.
'target_name': 'performance_browser_tests',
......@@ -4630,5 +4568,71 @@
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'unit_tests_run',
'type': 'none',
'dependencies': [
'unit_tests',
],
'includes': [
'unit_tests.isolate',
],
'actions': [
{
'action_name': 'isolate',
'inputs': [
'<@(isolate_dependency_tracked)',
],
'outputs': [
'<(PRODUCT_DIR)/unit_tests.results',
],
'action': [
'python',
'../tools/isolate/isolate.py',
'<(test_isolation_mode)',
'--outdir', '<(test_isolation_outdir)',
'--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
'--variable', 'OS', '<(OS)',
'--result', '<@(_outputs)',
'--isolate', 'unit_tests.isolate',
],
},
],
},
{
'target_name': 'browser_tests_run',
'type': 'none',
'dependencies': [
'browser_tests',
],
'includes': [
'browser_tests.isolate',
],
'actions': [
{
'action_name': 'isolate',
'inputs': [
'<@(isolate_dependency_tracked)',
],
'outputs': [
'<(PRODUCT_DIR)/browser_tests.results',
],
'action': [
'python',
'../tools/isolate/isolate.py',
'<(test_isolation_mode)',
'--outdir', '<(test_isolation_outdir)',
'--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
'--variable', 'OS', '<(OS)',
'--result', '<@(_outputs)',
'--isolate', 'browser_tests.isolate',
],
},
],
},
],
}],
], # 'conditions'
}
net/net.gyp
View file @ d34eb410
......@@ -1740,45 +1740,6 @@
},
],
'conditions': [
['inside_chromium_build==1', {
'targets': [
# This target depends on dependencies not fetched by WebKit's DEPS.
# In particular, ..\chrome\test\data and ..\third_party\python_26 on
# Windows.
{
'target_name': 'net_unittests_run',
'type': 'none',
'dependencies': [
'net_unittests',
],
'includes': [
'net_unittests.isolate',
],
'actions': [
{
'action_name': 'isolate',
'inputs': [
'net_unittests.isolate',
'<@(isolate_dependency_tracked)',
],
'outputs': [
'<(PRODUCT_DIR)/net_unittests.results',
],
'action': [
'python',
'../tools/isolate/isolate.py',
'<(test_isolation_mode)',
'--outdir', '<(test_isolation_outdir)',
'--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
'--variable', 'OS', '<(OS)',
'--result', '<@(_outputs)',
'--isolate', 'net_unittests.isolate',
],
},
],
},
],
}],
['os_posix == 1 and OS != "mac" and OS != "android"', {
'targets': [
{
......@@ -1981,5 +1942,41 @@
},
],
}],
['test_isolation_mode != "noop"', {
'targets': [
{
'target_name': 'net_unittests_run',
'type': 'none',
'dependencies': [
'net_unittests',
],
'includes': [
'net_unittests.isolate',
],
'actions': [
{
'action_name': 'isolate',
'inputs': [
'net_unittests.isolate',
'<@(isolate_dependency_tracked)',
],
'outputs': [
'<(PRODUCT_DIR)/net_unittests.results',
],
'action': [
'python',
'../tools/isolate/isolate.py',
'<(test_isolation_mode)',
'--outdir', '<(test_isolation_outdir)',
'--variable', 'PRODUCT_DIR', '<(PRODUCT_DIR)',
'--variable', 'OS', '<(OS)',
'--result', '<@(_outputs)',
'--isolate', 'net_unittests.isolate',
],
},
],
},
],
}],
],
}
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