Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 { | 4 { |
| 5 'includes': [ | 5 'includes': [ |
| 6 '../tools/perf/chrome_telemetry_build/telemetry_chrome_test.isolate', | 6 '../tools/perf/chrome_telemetry_build/telemetry_chrome_test.isolate', |
| 7 ], | 7 ], |
| 8 'conditions': [ | 8 'conditions': [ |
| 9 ['OS=="mac" or OS=="win"', { | 9 ['OS=="mac"', { |
| 10 'variables': { | 10 'variables': { |
| 11 'files': [ | 11 'files': [ |
| 12 # Other dependencies of the tests and their harness. | 12 # Other dependencies of the tests and their harness. |
| 13 '../testing/test_env.py', | 13 '../testing/test_env.py', |
| 14 '../testing/xvfb.py', | 14 '../testing/xvfb.py', |
| 15 '../testing/scripts/common.py', | 15 '../testing/scripts/common.py', |
| 16 '../testing/scripts/run_telemetry_as_googletest.py', | 16 '../testing/scripts/run_telemetry_as_googletest.py', |
| 17 ], | 17 ], |
| 18 'command': [ | 18 'command': [ |
| 19 '../testing/scripts/run_telemetry_as_googletest.py', | 19 '../testing/scripts/run_telemetry_as_googletest.py', |
| 20 '../tools/telemetry/run_tests', | 20 '../tools/telemetry/run_tests', |
| 21 '-v', | 21 '-v', |
| 22 '--chrome-root', | 22 '--chrome-root', |
| 23 '..' | 23 '..' |
| 24 ], | 24 ], |
| 25 }, | 25 }, |
| 26 }], | 26 }], |
| 27 ['OS=="win"', { | |
| 28 'variables': { | |
| 29 'files': [ | |
|
M-A Ruel
2015/11/23 16:09:05
Please keep common variables grouped, e.g. keep a
nednguyen
2015/11/23 16:11:52
Done.
| |
| 30 # Other dependencies of the tests and their harness. | |
| 31 '../testing/test_env.py', | |
| 32 '../testing/xvfb.py', | |
| 33 '../testing/scripts/common.py', | |
| 34 '../testing/scripts/run_telemetry_as_googletest.py', | |
| 35 ], | |
| 36 'command': [ | |
| 37 '../testing/scripts/run_telemetry_as_googletest.py', | |
| 38 '../tools/telemetry/run_tests', | |
| 39 '-v', | |
| 40 '--chrome-root', | |
| 41 '..' | |
| 42 # crbug.com/559154 | |
| 43 # TODO(nednguyen): Remove --jobs=1 once the bug is fixed to speed up | |
| 44 # the test run. | |
| 45 '--job=1', | |
| 46 ], | |
| 47 }, | |
| 48 }], | |
| 27 ] | 49 ] |
| 28 } | 50 } |
| OLD | NEW |