Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2013 The Chromium Authors. All rights reserved. | 2 # Copyright 2013 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 unit tests of the code in the perf directory. | 6 """This script runs unit tests of the code in the perf directory. |
| 7 | 7 |
| 8 This script DOES NOT run benchmarks. run_benchmark and run_measurement do that. | 8 This script DOES NOT run benchmarks. run_benchmark and run_measurement do that. |
| 9 """ | 9 """ |
| 10 | 10 |
| 11 import os | 11 import os |
| 12 import sys | 12 import sys |
| 13 | 13 |
| 14 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry')) | 14 sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry')) |
| 15 | 15 |
| 16 from telemetry.unittest import run_tests | 16 from telemetry.unittest import run_tests |
| 17 | 17 |
| 18 | 18 |
| 19 if __name__ == '__main__': | 19 if __name__ == '__main__': |
| 20 base_dir = os.path.dirname(os.path.realpath(__file__)) | 20 base_dir = os.path.dirname(os.path.realpath(__file__)) |
| 21 run_tests.environment = run_tests.Environment(base_dir, [base_dir]) | 21 run_tests.environment = run_tests.Environment(base_dir, [base_dir]) |
| 22 sys.exit(run_tests.RunTestsCommand.main()) | 22 test_result = run_tests.RunTestsCommand.main() |
| 23 | |
| 24 # Continue with chrome_proxy tests which are under a different directory. | |
| 25 chrome_proxy_dir = os.path.realpath( | |
| 26 os.path.join(os.path.dirname(__file__), os.pardir, 'chrome_proxy')) | |
| 27 sys.path.append(chrome_proxy_dir) | |
| 28 run_tests.environment = run_tests.Environment( | |
| 29 chrome_proxy_dir, [chrome_proxy_dir]) | |
| 30 | |
| 31 test_result += run_tests.RunTestsCommand.main() | |
| 32 sys.exit(test_result) | |
|
tonyg
2014/07/17 18:27:52
If the benchmark is happy, then I'm happy with thi
dtu
2014/07/17 22:17:38
I think I'd prefer another run_tests or run_unitte
| |
| OLD | NEW |