| 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 import os | 5 import os |
| 6 import sys | 6 import sys |
| 7 | 7 |
| 8 from telemetry.test import gtest_testrunner | 8 from telemetry.unittest import gtest_testrunner |
| 9 from telemetry.test import run_tests | 9 from telemetry.unittest import run_tests |
| 10 | 10 |
| 11 if __name__ == '__main__': | 11 if __name__ == '__main__': |
| 12 top_level_dir = os.path.abspath(os.path.dirname(__file__)) | 12 top_level_dir = os.path.abspath(os.path.dirname(__file__)) |
| 13 runner = gtest_testrunner.GTestTestRunner(print_result_after_run=False) | 13 runner = gtest_testrunner.GTestTestRunner(print_result_after_run=False) |
| 14 start_dir = 'telemetry' | 14 start_dir = 'telemetry' |
| 15 ret = run_tests.Main(sys.argv[1:], start_dir, top_level_dir, runner) | 15 ret = run_tests.Main(sys.argv[1:], start_dir, top_level_dir, runner) |
| 16 | 16 |
| 17 if runner.result: | 17 if runner.result: |
| 18 runner.result.PrintSummary() | 18 runner.result.PrintSummary() |
| 19 sys.exit(min(ret + runner.result.num_errors, 255)) | 19 sys.exit(min(ret + runner.result.num_errors, 255)) |
| 20 else: | 20 else: |
| 21 sys.exit(ret) | 21 sys.exit(ret) |
| OLD | NEW |