| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 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 import os.path | 6 import os.path |
| 7 import re | 7 import re |
| 8 import shutil | 8 import shutil |
| 9 import sys | 9 import sys |
| 10 import tempfile | 10 import tempfile |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 259 self.MakeEmptyJSONFile(os.path.join(profile, 'Default', 'Preferences')) | 259 self.MakeEmptyJSONFile(os.path.join(profile, 'Default', 'Preferences')) |
| 260 self.MakeEmptyJSONFile(os.path.join(profile, 'Local State')) | 260 self.MakeEmptyJSONFile(os.path.join(profile, 'Local State')) |
| 261 | 261 |
| 262 return profile | 262 return profile |
| 263 | 263 |
| 264 def NetLogName(self): | 264 def NetLogName(self): |
| 265 return os.path.join(self.profile, 'netlog.json') | 265 return os.path.join(self.profile, 'netlog.json') |
| 266 | 266 |
| 267 def MakeCmd(self, url, port): | 267 def MakeCmd(self, url, port): |
| 268 cmd = [self.binary, | 268 cmd = [self.binary, |
| 269 # Note that we do not use "--enable-logging" here because |
| 270 # it actually turns off logging to the Buildbot logs on |
| 271 # Windows (see http://crbug.com/169941). |
| 269 '--disable-web-resources', | 272 '--disable-web-resources', |
| 270 '--disable-preconnect', | 273 '--disable-preconnect', |
| 271 '--no-first-run', | 274 '--no-first-run', |
| 272 '--no-default-browser-check', | 275 '--no-default-browser-check', |
| 273 '--enable-logging', | |
| 274 '--log-level=1', | 276 '--log-level=1', |
| 275 '--safebrowsing-disable-auto-update', | 277 '--safebrowsing-disable-auto-update', |
| 276 # Suppress metrics reporting. This prevents misconfigured bots, | 278 # Suppress metrics reporting. This prevents misconfigured bots, |
| 277 # people testing at their desktop, etc from poisoning the UMA data. | 279 # people testing at their desktop, etc from poisoning the UMA data. |
| 278 '--metrics-recording-only', | 280 '--metrics-recording-only', |
| 279 # Chrome explicitly blacklists some ports as "unsafe" because | 281 # Chrome explicitly blacklists some ports as "unsafe" because |
| 280 # certain protocols use them. Chrome gives an error like this: | 282 # certain protocols use them. Chrome gives an error like this: |
| 281 # Error 312 (net::ERR_UNSAFE_PORT): Unknown error | 283 # Error 312 (net::ERR_UNSAFE_PORT): Unknown error |
| 282 # Unfortunately, the browser tester can randomly choose a | 284 # Unfortunately, the browser tester can randomly choose a |
| 283 # blacklisted port. To work around this, the tester whitelists | 285 # blacklisted port. To work around this, the tester whitelists |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 '--trace-children=yes', | 325 '--trace-children=yes', |
| 324 '--nacl-file=%s' % (self.options.files[0],), | 326 '--nacl-file=%s' % (self.options.files[0],), |
| 325 '--ignore=../tools/valgrind/tsan/ignores.txt', | 327 '--ignore=../tools/valgrind/tsan/ignores.txt', |
| 326 '--suppressions=../tools/valgrind/tsan/suppressions.txt', | 328 '--suppressions=../tools/valgrind/tsan/suppressions.txt', |
| 327 '--log-file=%s/log.%%p' % (self.tool_log_dir,)] + cmd | 329 '--log-file=%s/log.%%p' % (self.tool_log_dir,)] + cmd |
| 328 elif self.options.tool != None: | 330 elif self.options.tool != None: |
| 329 raise LaunchFailure('Invalid tool name "%s"' % (self.options.tool,)) | 331 raise LaunchFailure('Invalid tool name "%s"' % (self.options.tool,)) |
| 330 cmd.extend(self.options.browser_flags) | 332 cmd.extend(self.options.browser_flags) |
| 331 cmd.append(url) | 333 cmd.append(url) |
| 332 return cmd | 334 return cmd |
| OLD | NEW |