| OLD | NEW |
| 1 # -*- python -*- | 1 # -*- 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 | 6 import os |
| 7 | 7 |
| 8 Import('env') | 8 Import('env') |
| 9 | 9 |
| 10 if env.Bit('host_windows') or env.Bit('host_mac'): | 10 if env.Bit('host_windows') or env.Bit('host_mac'): |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 # See: https://code.google.com/p/chromium/issues/detail?id=129402 | 44 # See: https://code.google.com/p/chromium/issues/detail?id=129402 |
| 45 env.AddNodeToTestSuite( | 45 env.AddNodeToTestSuite( |
| 46 node, ['chrome_browser_tests'], 'run_breakpad_browser_process_crash_test', | 46 node, ['chrome_browser_tests'], 'run_breakpad_browser_process_crash_test', |
| 47 is_broken=(env.PPAPIBrowserTesterIsBroken() or | 47 is_broken=(env.PPAPIBrowserTesterIsBroken() or |
| 48 env.Bit('host_linux') or env.Bit('host_mac') or | 48 env.Bit('host_linux') or env.Bit('host_mac') or |
| 49 env.Bit('running_on_valgrind'))) | 49 env.Bit('running_on_valgrind'))) |
| 50 | 50 |
| 51 # This crash in trusted code should produce a crash dump. | 51 # This crash in trusted code should produce a crash dump. |
| 52 # DISABLED due to flakiness (http://crbug.com/247114). | 52 # DISABLED due to flakiness (http://crbug.com/247114). |
| 53 # crash_test_url = 'trusted_crash_in_startup.html' | 53 # crash_test_url = 'trusted_crash_in_startup.html' |
| 54 # if env.Bit('pnacl_generate_pexe'): | |
| 55 # crash_test_url += '?is_pnacl=true' | |
| 56 # node = env.PPAPIBrowserTester( | 54 # node = env.PPAPIBrowserTester( |
| 57 # 'breakpad_trusted_crash_in_startup_test.out', | 55 # 'breakpad_trusted_crash_in_startup_test.out', |
| 58 # python_tester_script=env.File('crash_dump_tester.py'), | 56 # python_tester_script=env.File('crash_dump_tester.py'), |
| 59 # url=crash_test_url, | 57 # url=crash_test_url, |
| 60 # nmf_names=['crash_test'], | 58 # nmf_names=['crash_test'], |
| 61 # files=[GetNexeByName('crash_test'), | 59 # files=[GetNexeByName('crash_test'), |
| 62 # env.File('trusted_crash_in_startup.html')], | 60 # env.File('trusted_crash_in_startup.html')], |
| 63 # osenv='NACL_CRASH_TEST=1', | 61 # osenv='NACL_CRASH_TEST=1', |
| 64 # args=platform_args + ['--expected_crash_dumps=%i' % expected_crash_dumps]) | 62 # args=platform_args + ['--expected_crash_dumps=%i' % expected_crash_dumps]) |
| 65 # | 63 # |
| (...skipping 29 matching lines...) Expand all Loading... |
| 95 python_tester_script=env.File('crash_dump_tester.py'), | 93 python_tester_script=env.File('crash_dump_tester.py'), |
| 96 url='untrusted_crash.html', | 94 url='untrusted_crash.html', |
| 97 nmf_names=['crash_test'], | 95 nmf_names=['crash_test'], |
| 98 files=[GetNexeByName('crash_test'), | 96 files=[GetNexeByName('crash_test'), |
| 99 env.File('untrusted_crash.html')], | 97 env.File('untrusted_crash.html')], |
| 100 args=platform_args + ['--expected_crash_dumps=0']) | 98 args=platform_args + ['--expected_crash_dumps=0']) |
| 101 env.AddNodeToTestSuite( | 99 env.AddNodeToTestSuite( |
| 102 node, ['chrome_browser_tests'], 'run_breakpad_untrusted_crash_test', | 100 node, ['chrome_browser_tests'], 'run_breakpad_untrusted_crash_test', |
| 103 is_broken=env.PPAPIBrowserTesterIsBroken() or | 101 is_broken=env.PPAPIBrowserTesterIsBroken() or |
| 104 env.Bit('running_on_valgrind')) | 102 env.Bit('running_on_valgrind')) |
| OLD | NEW |