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