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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 sys.executable, | 61 sys.executable, |
62 os.path.join(cmd_args.paths['build'], 'scripts', 'tools', 'runit.py'), | 62 os.path.join(cmd_args.paths['build'], 'scripts', 'tools', 'runit.py'), |
63 '--show-path', | 63 '--show-path', |
64 sys.executable, | 64 sys.executable, |
65 os.path.join(cmd_args.paths['build'], 'scripts', 'slave', 'runtest.py'), | 65 os.path.join(cmd_args.paths['build'], 'scripts', 'slave', 'runtest.py'), |
66 '--target', cmd_args.build_config_fs, | 66 '--target', cmd_args.build_config_fs, |
67 '--xvfb', | 67 '--xvfb', |
68 '--builder-name', cmd_args.properties['buildername'], | 68 '--builder-name', cmd_args.properties['buildername'], |
69 '--slave-name', cmd_args.properties['slavename'], | 69 '--slave-name', cmd_args.properties['slavename'], |
70 '--build-number', str(cmd_args.properties['buildnumber']), | 70 '--build-number', str(cmd_args.properties['buildnumber']), |
| 71 '--build-properties', json.dumps(cmd_args.properties), |
71 ] + runtest_args) | 72 ] + runtest_args) |
72 | 73 |
73 | 74 |
74 @contextlib.contextmanager | 75 @contextlib.contextmanager |
75 def temporary_file(): | 76 def temporary_file(): |
76 fd, path = tempfile.mkstemp() | 77 fd, path = tempfile.mkstemp() |
77 os.close(fd) | 78 os.close(fd) |
78 try: | 79 try: |
79 yield path | 80 yield path |
80 finally: | 81 finally: |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 key += 'passes' | 125 key += 'passes' |
125 # TODO(dpranke): crbug.com/357867 ... Why are we assigning result | 126 # TODO(dpranke): crbug.com/357867 ... Why are we assigning result |
126 # instead of actual_result here. Do we even need these things to be | 127 # instead of actual_result here. Do we even need these things to be |
127 # hashes, or just lists? | 128 # hashes, or just lists? |
128 data = result | 129 data = result |
129 else: | 130 else: |
130 key += 'failures' | 131 key += 'failures' |
131 results[key][test] = data | 132 results[key][test] = data |
132 | 133 |
133 return results | 134 return results |
OLD | NEW |