| Index: masters/master.chromium.swarm/master.cfg
|
| diff --git a/masters/master.chromium.swarm/master.cfg b/masters/master.chromium.swarm/master.cfg
|
| index a8b21f71f4f24b89dcae0056cc862b646828b122..aadd59bde65a976201fc6ddd29b910da848025f0 100644
|
| --- a/masters/master.chromium.swarm/master.cfg
|
| +++ b/masters/master.chromium.swarm/master.cfg
|
| @@ -83,7 +83,7 @@ c['schedulers'] = [s_chromium_swarm]
|
|
|
| builders = []
|
|
|
| -def SetupSwarmTests(machine, options=None, project=None):
|
| +def SetupSwarmTests(machine, data_dest_dir, options=None, project=None):
|
| return machine.SwarmFactory(
|
| tests=['base_unittests', 'net_unittests'],
|
| options=options,
|
| @@ -93,6 +93,8 @@ def SetupSwarmTests(machine, options=None, project=None):
|
| 'GYP_DEFINES': 'tests_run=hashtable',
|
| 'GYP_MSVS_VERSION': '2010',
|
| },
|
| + 'data_server' : 'http://vm155-m1:8080/',
|
| + 'data_dest_dir' : data_dest_dir,
|
| 'swarm_server' : 'http://vm155-m1:9001/'})
|
|
|
|
|
| @@ -105,6 +107,8 @@ m_linux = swarm_factory.SwarmFactory(
|
| full_checkout=True)
|
| f_chromium_linux_swarm = SetupSwarmTests(
|
| m_linux,
|
| + # TODO(csharp): Make this a variable in site_config
|
| + '/etc/swarm-data',
|
| options=['chromium_swarm_tests'])
|
|
|
| m_win = swarm_factory.SwarmFactory(
|
| @@ -113,6 +117,7 @@ m_win = swarm_factory.SwarmFactory(
|
| full_checkout=True)
|
| f_chromium_win_swarm = SetupSwarmTests(
|
| m_win,
|
| + '\\\\fas2-110\\swarm-data',
|
| project='all.sln;chromium_swarm_tests')
|
|
|
| m_mac = swarm_factory.SwarmFactory(
|
| @@ -121,6 +126,7 @@ m_mac = swarm_factory.SwarmFactory(
|
| full_checkout=True)
|
| f_chromium_mac_swarm = SetupSwarmTests(
|
| m_mac,
|
| + '/etc/swarm-data',
|
| options=['--', '-target', 'chromium_swarm_tests'])
|
|
|
| # ----------------------------------------------------------------------------
|
|
|