Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 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 'telemetry.isolate', | 6 'telemetry.isolate', |
| 7 ], | 7 ], |
| 8 'conditions': [ | 8 'conditions': [ |
| 9 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { | 9 ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { |
| 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 '../third_party/typ/', | 13 '../third_party/typ/', |
| 14 '../third_party/catapult/', | 14 '../third_party/catapult/', |
| 15 '../testing/test_env.py', | |
| 16 '../testing/xvfb.py', | |
|
M-A Ruel
2015/10/13 21:27:25
This must only be mapped when use_x11==1
Ken Russell (switch to Gerrit)
2015/10/13 23:09:36
Earlier try jobs which did this failed a module im
M-A Ruel
2015/10/14 00:25:50
ok
| |
| 15 '../testing/scripts/common.py', | 17 '../testing/scripts/common.py', |
| 16 '../testing/scripts/run_telemetry_as_googletest.py', | 18 '../testing/scripts/run_telemetry_as_googletest.py', |
| 17 # The following represent the actual tests. | 19 # The following represent the actual tests. |
| 18 '../content/test/gpu/', | 20 '../content/test/gpu/', |
| 19 # For webgl_conformance_expectations_unittest | 21 # For webgl_conformance_expectations_unittest |
| 20 '../third_party/webgl/src/sdk/tests/', | 22 '../third_party/webgl/src/sdk/tests/', |
| 21 ], | 23 ], |
| 22 'command': [ | 24 'command': [ |
| 23 '../testing/scripts/run_telemetry_as_googletest.py', | 25 '../testing/scripts/run_telemetry_as_googletest.py', |
| 24 '../content/test/gpu/run_unittests.py', | 26 '../content/test/gpu/run_unittests.py', |
| 25 '-v', | 27 '-v', |
| 26 ], | 28 ], |
| 27 }, | 29 }, |
| 28 }], | 30 }], |
| 29 ] | 31 ] |
| 30 } | 32 } |
| OLD | NEW |