| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 import os | 6 import os |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry')) | 9 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry')) |
| 10 | 10 |
| 11 from telemetry import test_runner | 11 from telemetry import test_runner |
| 12 from telemetry.core import environment | |
| 13 from telemetry.core import util | 12 from telemetry.core import util |
| 14 from telemetry.util import bootstrap | 13 from telemetry.util import bootstrap |
| 15 | 14 |
| 16 | 15 |
| 17 CROS_BOOSTRAP_DEPS_PATH = os.path.join( | 16 CROS_BOOSTRAP_DEPS_PATH = os.path.join( |
| 18 util.GetChromiumSrcDir(), 'tools', 'cros', 'bootstrap_deps') | 17 util.GetChromiumSrcDir(), 'tools', 'cros', 'bootstrap_deps') |
| 19 | 18 |
| 20 | 19 |
| 21 def main(): | 20 def main(): |
| 22 if '--print-bootstrap-deps-cros' in sys.argv: | 21 if '--print-bootstrap-deps-cros' in sys.argv: |
| 23 print bootstrap.ListAllDepsPaths(CROS_BOOSTRAP_DEPS_PATH) | 22 print bootstrap.ListAllDepsPaths(CROS_BOOSTRAP_DEPS_PATH) |
| 24 return 0 | 23 return 0 |
| 25 | 24 |
| 26 base_dir = os.path.dirname(os.path.realpath(__file__)) | 25 top_level_dir = os.path.dirname(os.path.realpath(__file__)) |
| 27 test_runner.config = environment.Environment([base_dir]) | 26 environment = test_runner.Environment( |
| 28 sys.exit(test_runner.main()) | 27 top_level_dir=top_level_dir, |
| 28 test_dirs=[os.path.join(top_level_dir, 'benchmarks')], |
| 29 page_test_dirs=[os.path.join(top_level_dir, 'measurements')], |
| 30 page_set_dirs=[os.path.join(top_level_dir, 'page_sets')] |
| 31 ) |
| 32 return test_runner.main(environment) |
| 29 | 33 |
| 30 | 34 |
| 31 if __name__ == '__main__': | 35 if __name__ == '__main__': |
| 32 sys.exit(main()) | 36 sys.exit(main()) |
| OLD | NEW |