summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
Diffstat (limited to 'ppapi')
-rwxr-xr-xppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py3
-rwxr-xr-xppapi/native_client/tools/browser_tester/browser_tester.py3
-rwxr-xr-xppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py2
3 files changed, 6 insertions, 2 deletions
diff --git a/ppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py b/ppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py
index cc3d14b..0963887 100755
--- a/ppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py
+++ b/ppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py
@@ -141,8 +141,7 @@ def Main(cleanup_funcs):
# dumps to a temporary directory.
home_dir = temp_dir
os.environ['HOME'] = home_dir
- # On Linux, we also need to set CHROME_ENABLE_BREAKPAD.
- os.environ['CHROME_ENABLE_BREAKPAD'] = '1'
+ options.enable_crash_reporter = True
result = browser_tester.Run(options.url, options)
diff --git a/ppapi/native_client/tools/browser_tester/browser_tester.py b/ppapi/native_client/tools/browser_tester/browser_tester.py
index 3b740a3..061a138 100755
--- a/ppapi/native_client/tools/browser_tester/browser_tester.py
+++ b/ppapi/native_client/tools/browser_tester/browser_tester.py
@@ -136,6 +136,9 @@ def BuildArgParser():
action='store_true',
help='Do not signal a failure if the browser process '
'crashes')
+ parser.add_option('--enable_crash_reporter', dest='enable_crash_reporter',
+ action='store_true', default=False,
+ help='Force crash reporting on.')
return parser
diff --git a/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py b/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py
index d8bf9ac..1b25f203 100755
--- a/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py
+++ b/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py
@@ -305,6 +305,8 @@ class ChromeLauncher(BrowserLauncher):
cmd.append('--load-extension=%s' %
','.join(self.options.browser_extensions))
cmd.append('--enable-experimental-extension-apis')
+ if self.options.enable_crash_reporter:
+ cmd.append('--enable-crash-reporter-for-testing')
if self.options.tool == 'memcheck':
cmd = ['src/third_party/valgrind/memcheck.sh',
'-v',