| Index: ppapi/native_client/tests/breakpad_crash_test/nacl.scons
|
| diff --git a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
|
| index 2dd6984fb901ee9e3be111b4142ceacac26c6bd4..5b75448e542fba7b6d5d9a3264217b3f6e733281 100644
|
| --- a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
|
| +++ b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
|
| @@ -26,35 +26,31 @@ def GetNexeByName(name):
|
|
|
| # This tests that crashes in Chromium's browser process successfully
|
| # produce crash dumps via Breakpad.
|
| -# TODO(mseaborn): Enable this for Linux, too, when Breakpad is
|
| -# compiled into Chromium by default.
|
| -# See http://code.google.com/p/chromium/issues/detail?id=105778
|
| -if env.Bit('host_windows') or env.Bit('host_mac'):
|
| - node = env.PPAPIBrowserTester(
|
| - 'breakpad_browser_process_crash_test.out',
|
| - python_tester_script=env.File('crash_dump_tester.py'),
|
| - browser_flags=['--crash-test'], # Tell the browser process to crash.
|
| - url='browser_process_crash.html',
|
| - nmf_names=[],
|
| - files=[env.File('browser_process_crash.html')],
|
| - args=platform_args + ['--expect_browser_process_crash',
|
| - '--expected_crash_dumps=1',
|
| - '--expected_process_type=browser'])
|
| - env.AddNodeToTestSuite(
|
| - node, ['chrome_browser_tests'], 'run_breakpad_browser_process_crash_test',
|
| - # For some strange reason, this test sometimes fails on the
|
| - # second run (for the SRPC PPAPI proxy) on the Windows 32-bit
|
| - # and 64-bit buildbots. The failure modes are that the browser
|
| - # process hangs, or that a .dmp file is produced with no .txt
|
| - # file. Maybe there is a problem with the command line getting
|
| - # too long?
|
| - # TODO(mseaborn): Remove this when the "--enable-nacl-srpc-proxy"
|
| - # option is removed, or investigate and fix.
|
| - is_broken=(env.PPAPIBrowserTesterIsBroken() or
|
| - env.Bit('running_on_valgrind') or
|
| - (env.Bit('host_windows') and
|
| - '--enable-nacl-srpc-proxy' in
|
| - os.environ.get('NACL_BROWSER_FLAGS', ''))))
|
| +node = env.PPAPIBrowserTester(
|
| + 'breakpad_browser_process_crash_test.out',
|
| + python_tester_script=env.File('crash_dump_tester.py'),
|
| + browser_flags=['--crash-test'], # Tell the browser process to crash.
|
| + url='browser_process_crash.html',
|
| + nmf_names=[],
|
| + files=[env.File('browser_process_crash.html')],
|
| + args=platform_args + ['--expect_browser_process_crash',
|
| + '--expected_crash_dumps=1',
|
| + '--expected_process_type=browser'])
|
| +env.AddNodeToTestSuite(
|
| + node, ['chrome_browser_tests'], 'run_breakpad_browser_process_crash_test',
|
| + # For some strange reason, this test sometimes fails on the
|
| + # second run (for the SRPC PPAPI proxy) on the Windows 32-bit
|
| + # and 64-bit buildbots. The failure modes are that the browser
|
| + # process hangs, or that a .dmp file is produced with no .txt
|
| + # file. Maybe there is a problem with the command line getting
|
| + # too long?
|
| + # TODO(mseaborn): Remove this when the "--enable-nacl-srpc-proxy"
|
| + # option is removed, or investigate and fix.
|
| + is_broken=(env.PPAPIBrowserTesterIsBroken() or
|
| + env.Bit('running_on_valgrind') or
|
| + (env.Bit('host_windows') and
|
| + '--enable-nacl-srpc-proxy' in
|
| + os.environ.get('NACL_BROWSER_FLAGS', ''))))
|
|
|
| # This crash in trusted code should produce a crash dump.
|
| crash_test_url = 'trusted_crash_in_startup.html'
|
|
|