Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Side by Side Diff: tools/chrome_proxy/run_tests

Issue 738163003: Revert of Fix regression in chrome_proxy tests caused by switching to typ. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 subprocess 12 import subprocess
13 import sys 13 import sys
14 14
15 15
16 if __name__ == '__main__': 16 if __name__ == '__main__':
17 proxy_dir = os.path.dirname(os.path.realpath(__file__)) 17 proxy_dir = os.path.dirname(os.path.realpath(__file__))
18 perf_dir = os.path.realpath(os.path.join(proxy_dir, '..', 'perf'))
19 telemetry_dir = os.path.realpath(os.path.join(proxy_dir, '..', 'telemetry')) 18 telemetry_dir = os.path.realpath(os.path.join(proxy_dir, '..', 'telemetry'))
20 19
21 env = os.environ.copy() 20 env = os.environ.copy()
22 if 'PYTHONPATH' in env: 21 if 'PYTHONPATH' in env:
23 env['PYTHONPATH'] = env['PYTHONPATH'] + os.pathsep + telemetry_dir 22 env['PYTHONPATH'] = env['PYTHONPATH'] + os.pathsep + telemetry_dir
24 else: 23 else:
25 env['PYTHONPATH'] = telemetry_dir 24 env['PYTHONPATH'] = telemetry_dir
26 25
27 path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'unittest_util', 26 path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'unittest_util',
28 'run_tests.py') 27 'run_tests.py')
29 argv = ['--top-level-dir', proxy_dir, '--path', perf_dir] + sys.argv[1:] 28 argv = ['--top-level-dir', proxy_dir] + sys.argv[1:]
30 sys.exit(subprocess.call([sys.executable, path_to_run_tests] + argv, env=env)) 29 sys.exit(subprocess.call([sys.executable, path_to_run_tests] + argv, env=env))
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698