| 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 This script runs tests to verify that the perf tools are working. | 6 This script runs tests to verify that the perf tools are working. | 
| 7 | 7 | 
| 8 The actual performance tools are not run by this script. | 8 The actual performance tools are not run by this script. | 
| 9 """ | 9 """ | 
| 10 | 10 | 
| 11 import os | 11 import os | 
| 12 import sys | 12 import sys | 
| 13 | 13 | 
| 14 import perf_tools | 14 import perf_tools | 
| 15 import telemetry.gtest_testrunner | 15 from telemetry.test import gtest_testrunner | 
| 16 import telemetry.run_tests | 16 from telemetry.test import run_tests | 
| 17 | 17 | 
| 18 if __name__ == '__main__': | 18 if __name__ == '__main__': | 
| 19   top_level_dir = os.path.abspath( | 19   top_level_dir = os.path.abspath(os.path.dirname(__file__)) | 
| 20     os.path.dirname(__file__)) | 20   runner = gtest_testrunner.GTestTestRunner(print_result_after_run=False) | 
| 21   runner = telemetry.gtest_testrunner.GTestTestRunner( |  | 
| 22       print_result_after_run=False) |  | 
| 23   start_dir = 'perf_tools' | 21   start_dir = 'perf_tools' | 
| 24   ret = telemetry.run_tests.Main( | 22   ret = run_tests.Main(sys.argv[1:], start_dir, top_level_dir, runner) | 
| 25     sys.argv[1:], start_dir, top_level_dir, runner) |  | 
| 26 | 23 | 
| 27   start_dir = 'page_sets' | 24   start_dir = 'page_sets' | 
| 28   ret = ret + telemetry.run_tests.Main( | 25   ret = ret + run_tests.Main(sys.argv[1:], start_dir, top_level_dir, runner) | 
| 29     sys.argv[1:], start_dir, top_level_dir, runner) |  | 
| 30 | 26 | 
| 31   runner.result.PrintSummary() | 27   runner.result.PrintSummary() | 
| 32 | 28 | 
| 33   sys.exit(max(ret + runner.result.num_errors, 255)) | 29   sys.exit(max(ret + runner.result.num_errors, 255)) | 
| OLD | NEW | 
|---|