OLD | NEW |
1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 | 4 |
5 import argparse | 5 import argparse |
6 import contextlib | 6 import contextlib |
7 import json | 7 import json |
8 import os | 8 import os |
9 import subprocess | 9 import subprocess |
10 import sys | 10 import sys |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 if cmd_args.use_src_side_runtest_py: | 70 if cmd_args.use_src_side_runtest_py: |
71 cmd = [ | 71 cmd = [ |
72 sys.executable, | 72 sys.executable, |
73 os.path.join( | 73 os.path.join( |
74 cmd_args.paths['checkout'], 'infra', 'scripts', 'runtest_wrapper.py'), | 74 cmd_args.paths['checkout'], 'infra', 'scripts', 'runtest_wrapper.py'), |
75 '--', | 75 '--', |
76 ] | 76 ] |
77 else: | 77 else: |
78 cmd = [ | 78 cmd = [ |
79 sys.executable, | 79 sys.executable, |
80 os.path.join(cmd_args.paths['build'], 'scripts', 'tools', 'runit.py'), | 80 cmd_args.paths['runit.py'], |
81 '--show-path', | 81 '--show-path', |
82 sys.executable, | 82 sys.executable, |
83 os.path.join(cmd_args.paths['build'], 'scripts', 'slave', 'runtest.py'), | 83 cmd_args.paths['runtest.py'], |
84 ] | 84 ] |
85 return run_command(cmd + [ | 85 return run_command(cmd + [ |
86 '--target', cmd_args.build_config_fs, | 86 '--target', cmd_args.build_config_fs, |
87 '--xvfb', | 87 '--xvfb', |
88 '--builder-name', cmd_args.properties['buildername'], | 88 '--builder-name', cmd_args.properties['buildername'], |
89 '--slave-name', cmd_args.properties['slavename'], | 89 '--slave-name', cmd_args.properties['slavename'], |
90 '--build-number', str(cmd_args.properties['buildnumber']), | 90 '--build-number', str(cmd_args.properties['buildnumber']), |
91 '--build-properties', json.dumps(cmd_args.properties), | 91 '--build-properties', json.dumps(cmd_args.properties), |
92 ] + runtest_args) | 92 ] + runtest_args) |
93 | 93 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 # TODO(dpranke): crbug.com/357867 ... Why are we assigning result | 146 # TODO(dpranke): crbug.com/357867 ... Why are we assigning result |
147 # instead of actual_result here. Do we even need these things to be | 147 # instead of actual_result here. Do we even need these things to be |
148 # hashes, or just lists? | 148 # hashes, or just lists? |
149 data = result | 149 data = result |
150 else: | 150 else: |
151 key += 'failures' | 151 key += 'failures' |
152 results[key][test] = data | 152 results[key][test] = data |
153 | 153 |
154 return results | 154 return results |
155 | 155 |
OLD | NEW |