Index: chrome/test/pyautolib/pyauto.py |
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py |
index 4cd634f61bfedfd172a43379060afb3dd23e8bfd..17bf46b5191763ce218629375d996fbdbf45c2a6 100644 |
--- a/chrome/test/pyautolib/pyauto.py |
+++ b/chrome/test/pyautolib/pyauto.py |
@@ -60,7 +60,7 @@ def _LocateBinDirs(): |
os.pardir, os.pardir, 'third_party'), |
script_dir, |
] |
- sys.path += bin_dirs.get(sys.platform, []) + deps_dirs |
+ sys.path += map(os.path.normpath, bin_dirs.get(sys.platform, []) + deps_dirs) |
_LocateBinDirs() |
@@ -1304,7 +1304,7 @@ class Main(object): |
else: |
args = self._LoadTestNamesFrom(pyauto_tests_file) |
args = args * self._options.repeat |
- logging.debug("Loading tests from %s", args) |
+ logging.debug("Loading %d tests from %s", len(args), args) |
loaded_tests = unittest.defaultTestLoader.loadTestsFromNames(args) |
return loaded_tests |
@@ -1336,8 +1336,12 @@ class Main(object): |
raw_input('Attach debugger to process %s and hit <enter> ' % os.getpid()) |
suite_args = [sys.argv[0]] |
- if self._options.chrome_flags: |
- suite_args.append('--extra-chrome-flags=' + self._options.chrome_flags) |
+ chrome_flags = self._options.chrome_flags |
+ # Enable crash reporter by default on posix. It's already enabled on win. |
John Grabowski
2010/07/27 23:35:30
If already enabled by default on windows (in the b
Nirnimesh
2010/07/28 01:14:03
The win flow is somewhat different, esp after the
|
+ if PyUITest.IsPosix(): |
+ chrome_flags += ' --enable-crash-reporter' |
+ if chrome_flags: |
+ suite_args.append('--extra-chrome-flags=%s' % chrome_flags) |
pyauto_suite = PyUITestSuite(suite_args) |
loaded_tests = self._LoadTests(self._args) |
pyauto_suite.addTests(loaded_tests) |