| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2014 The Chromium Authors. All rights reserved. | 2 # Copyright 2014 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 does that. | 8 This script DOES NOT run benchmarks. run_benchmark does 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 import chrome_proxy_config |
| 15 |
| 16 sys.path.insert(1, chrome_proxy_config.TELEMETRY_DIR) |
| 15 | 17 |
| 16 from telemetry.testing import unittest_runner | 18 from telemetry.testing import unittest_runner |
| 17 | 19 |
| 18 import chrome_proxy_config | |
| 19 | |
| 20 | 20 |
| 21 if __name__ == '__main__': | 21 if __name__ == '__main__': |
| 22 sys.exit(unittest_runner.Run(chrome_proxy_config.Config(['integration_tests', | 22 sys.exit(unittest_runner.Run(chrome_proxy_config.Config(['integration_tests', |
| 23 'live_tests']))) | 23 'live_tests']))) |
| OLD | NEW |