diff options
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/tests/breakpad_crash_test/nacl.scons | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons index b982eb0..00360b6 100644 --- a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons +++ b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons @@ -49,25 +49,26 @@ env.AddNodeToTestSuite( env.Bit('running_on_valgrind'))) # This crash in trusted code should produce a crash dump. -crash_test_url = 'trusted_crash_in_startup.html' -if env.Bit('pnacl_generate_pexe'): - crash_test_url += '?is_pnacl=true' -node = env.PPAPIBrowserTester( - 'breakpad_trusted_crash_in_startup_test.out', - python_tester_script=env.File('crash_dump_tester.py'), - url=crash_test_url, - nmf_names=['crash_test'], - files=[GetNexeByName('crash_test'), - env.File('trusted_crash_in_startup.html')], - osenv='NACL_CRASH_TEST=1', - args=platform_args + ['--expected_crash_dumps=%i' % expected_crash_dumps]) - -env.AddNodeToTestSuite( - node, - ['chrome_browser_tests'], - 'run_breakpad_trusted_crash_in_startup_test', - is_broken=env.PPAPIBrowserTesterIsBroken() or - env.Bit('running_on_valgrind')) +# DISABLED due to flakiness (http://crbug.com/247114). +# crash_test_url = 'trusted_crash_in_startup.html' +# if env.Bit('pnacl_generate_pexe'): +# crash_test_url += '?is_pnacl=true' +# node = env.PPAPIBrowserTester( +# 'breakpad_trusted_crash_in_startup_test.out', +# python_tester_script=env.File('crash_dump_tester.py'), +# url=crash_test_url, +# nmf_names=['crash_test'], +# files=[GetNexeByName('crash_test'), +# env.File('trusted_crash_in_startup.html')], +# osenv='NACL_CRASH_TEST=1', +# args=platform_args + ['--expected_crash_dumps=%i' % expected_crash_dumps]) +# +# env.AddNodeToTestSuite( +# node, +# ['chrome_browser_tests'], +# 'run_breakpad_trusted_crash_in_startup_test', +# is_broken=env.PPAPIBrowserTesterIsBroken() or +# env.Bit('running_on_valgrind')) # This tests a crash that occurs inside a syscall handler. # Ultimately this should be recognised as a crash caused by untrusted code. |