| 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 24 matching lines...) Expand all Loading... |
| 35 python_tester_script=env.File('crash_dump_tester.py'), | 35 python_tester_script=env.File('crash_dump_tester.py'), |
| 36 browser_flags=['--crash-test'], # Tell the browser process to crash. | 36 browser_flags=['--crash-test'], # Tell the browser process to crash. |
| 37 url='browser_process_crash.html', | 37 url='browser_process_crash.html', |
| 38 nmf_names=[], | 38 nmf_names=[], |
| 39 files=[env.File('browser_process_crash.html')], | 39 files=[env.File('browser_process_crash.html')], |
| 40 args=platform_args + ['--expect_browser_process_crash', | 40 args=platform_args + ['--expect_browser_process_crash', |
| 41 '--expected_crash_dumps=1', | 41 '--expected_crash_dumps=1', |
| 42 '--expected_process_type=browser']) | 42 '--expected_process_type=browser']) |
| 43 env.AddNodeToTestSuite( | 43 env.AddNodeToTestSuite( |
| 44 node, ['chrome_browser_tests'], 'run_breakpad_browser_process_crash_test', | 44 node, ['chrome_browser_tests'], 'run_breakpad_browser_process_crash_test', |
| 45 # For some strange reason, this test fails on the second run | 45 # For some strange reason, this test sometimes fails on the |
| 46 # (for the SRPC PPAPI proxy) on the Windows XP (32-bit) | 46 # second run (for the SRPC PPAPI proxy) on the Windows 32-bit |
| 47 # buildbots. The failures modes are that the browser process | 47 # and 64-bit buildbots. The failure modes are that the browser |
| 48 # hangs, or that a .dmp file is produced with no .txt file. | 48 # process hangs, or that a .dmp file is produced with no .txt |
| 49 # Maybe there is a problem with the command line getting too | 49 # file. Maybe there is a problem with the command line getting |
| 50 # long? | 50 # too long? |
| 51 # TODO(mseaborn): Remove this when the "--enable-srpc-proxy" | 51 # TODO(mseaborn): Remove this when the "--enable-nacl-srpc-proxy" |
| 52 # option is removed, or investigate and fix. | 52 # option is removed, or investigate and fix. |
| 53 is_broken=(env.PPAPIBrowserTesterIsBroken() or | 53 is_broken=(env.PPAPIBrowserTesterIsBroken() or |
| 54 env.Bit('running_on_valgrind') or | 54 env.Bit('running_on_valgrind') or |
| 55 (env.Bit('host_windows') and | 55 (env.Bit('host_windows') and |
| 56 env.Bit('build_x86_32') and | 56 '--enable-nacl-srpc-proxy' in |
| 57 '--enable-srpc-proxy' in | |
| 58 os.environ.get('NACL_BROWSER_FLAGS', '')))) | 57 os.environ.get('NACL_BROWSER_FLAGS', '')))) |
| 59 | 58 |
| 60 # This crash in trusted code should produce a crash dump. | 59 # This crash in trusted code should produce a crash dump. |
| 61 crash_test_url = 'trusted_crash_in_startup.html' | 60 crash_test_url = 'trusted_crash_in_startup.html' |
| 62 if env.Bit('pnacl_generate_pexe'): | 61 if env.Bit('pnacl_generate_pexe'): |
| 63 crash_test_url += '?is_pnacl=true' | 62 crash_test_url += '?is_pnacl=true' |
| 64 node = env.PPAPIBrowserTester( | 63 node = env.PPAPIBrowserTester( |
| 65 'breakpad_trusted_crash_in_startup_test.out', | 64 'breakpad_trusted_crash_in_startup_test.out', |
| 66 python_tester_script=env.File('crash_dump_tester.py'), | 65 python_tester_script=env.File('crash_dump_tester.py'), |
| 67 url=crash_test_url, | 66 url=crash_test_url, |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 python_tester_script=env.File('crash_dump_tester.py'), | 99 python_tester_script=env.File('crash_dump_tester.py'), |
| 101 url='untrusted_crash.html', | 100 url='untrusted_crash.html', |
| 102 nmf_names=['crash_test'], | 101 nmf_names=['crash_test'], |
| 103 files=[GetNexeByName('crash_test'), | 102 files=[GetNexeByName('crash_test'), |
| 104 env.File('untrusted_crash.html')], | 103 env.File('untrusted_crash.html')], |
| 105 args=platform_args + ['--expected_crash_dumps=0']) | 104 args=platform_args + ['--expected_crash_dumps=0']) |
| 106 env.AddNodeToTestSuite( | 105 env.AddNodeToTestSuite( |
| 107 node, ['chrome_browser_tests'], 'run_breakpad_untrusted_crash_test', | 106 node, ['chrome_browser_tests'], 'run_breakpad_untrusted_crash_test', |
| 108 is_broken=env.PPAPIBrowserTesterIsBroken() or | 107 is_broken=env.PPAPIBrowserTesterIsBroken() or |
| 109 env.Bit('running_on_valgrind')) | 108 env.Bit('running_on_valgrind')) |
| OLD | NEW |