| 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 # env.AddNodeToTestSuite( | 64 # env.AddNodeToTestSuite( |
| 65 # node, | 65 # node, |
| 66 # ['chrome_browser_tests'], | 66 # ['chrome_browser_tests'], |
| 67 # 'run_breakpad_trusted_crash_in_startup_test', | 67 # 'run_breakpad_trusted_crash_in_startup_test', |
| 68 # is_broken=env.PPAPIBrowserTesterIsBroken() or | 68 # is_broken=env.PPAPIBrowserTesterIsBroken() or |
| 69 # env.Bit('running_on_valgrind')) | 69 # env.Bit('running_on_valgrind')) |
| 70 | 70 |
| 71 # This tests a crash that occurs inside a syscall handler. | 71 # This tests a crash that occurs inside a syscall handler. |
| 72 # Ultimately this should be recognised as a crash caused by untrusted code. | 72 # Ultimately this should be recognised as a crash caused by untrusted code. |
| 73 # See http://code.google.com/p/nativeclient/issues/detail?id=579 | 73 # See http://code.google.com/p/nativeclient/issues/detail?id=579 |
| 74 node = env.PPAPIBrowserTester( | 74 # DISABLED due to flakiness (http://crbug.com/332331) |
| 75 'breakpad_crash_in_syscall_test.out', | 75 # node = env.PPAPIBrowserTester( |
| 76 python_tester_script=env.File('crash_dump_tester.py'), | 76 # 'breakpad_crash_in_syscall_test.out', |
| 77 url='crash_in_syscall.html', | 77 # python_tester_script=env.File('crash_dump_tester.py'), |
| 78 nmf_names=['crash_in_syscall'], | 78 # url='crash_in_syscall.html', |
| 79 files=[GetNexeByName('crash_in_syscall'), | 79 # nmf_names=['crash_in_syscall'], |
| 80 env.File('crash_in_syscall.html')], | 80 # files=[GetNexeByName('crash_in_syscall'), |
| 81 args=platform_args + ['--expected_crash_dumps=%i' % expected_crash_dumps]) | 81 # env.File('crash_in_syscall.html')], |
| 82 env.AddNodeToTestSuite( | 82 # args=platform_args + ['--expected_crash_dumps=%i' % expected_crash_dumps]) |
| 83 node, ['chrome_browser_tests'], 'run_breakpad_crash_in_syscall_test', | 83 # env.AddNodeToTestSuite( |
| 84 # This test is currently flaky on Win 32 bit on x86, disabling there. | 84 # node, ['chrome_browser_tests'], 'run_breakpad_crash_in_syscall_test', |
| 85 # See bug: https://code.google.com/p/chromium/issues/detail?id=254583 | 85 # # This test is currently flaky on Win 32 bit on x86, disabling there. |
| 86 is_broken=env.PPAPIBrowserTesterIsBroken() or | 86 # # See bug: https://code.google.com/p/chromium/issues/detail?id=254583 |
| 87 env.Bit('running_on_valgrind') or | 87 # is_broken=env.PPAPIBrowserTesterIsBroken() or |
| 88 (env.Bit('host_windows') and env.Bit('build_x86_32'))) | 88 # env.Bit('running_on_valgrind') or |
| 89 # (env.Bit('host_windows') and env.Bit('build_x86_32'))) |
| 89 | 90 |
| 90 # Crashes in untrusted code should not produce crash dumps. | 91 # Crashes in untrusted code should not produce crash dumps. |
| 91 node = env.PPAPIBrowserTester( | 92 node = env.PPAPIBrowserTester( |
| 92 'breakpad_untrusted_crash_test.out', | 93 'breakpad_untrusted_crash_test.out', |
| 93 python_tester_script=env.File('crash_dump_tester.py'), | 94 python_tester_script=env.File('crash_dump_tester.py'), |
| 94 url='untrusted_crash.html', | 95 url='untrusted_crash.html', |
| 95 nmf_names=['crash_test'], | 96 nmf_names=['crash_test'], |
| 96 files=[GetNexeByName('crash_test'), | 97 files=[GetNexeByName('crash_test'), |
| 97 env.File('untrusted_crash.html')], | 98 env.File('untrusted_crash.html')], |
| 98 args=platform_args + ['--expected_crash_dumps=0']) | 99 args=platform_args + ['--expected_crash_dumps=0']) |
| 99 env.AddNodeToTestSuite( | 100 env.AddNodeToTestSuite( |
| 100 node, ['chrome_browser_tests'], 'run_breakpad_untrusted_crash_test', | 101 node, ['chrome_browser_tests'], 'run_breakpad_untrusted_crash_test', |
| 101 is_broken=env.PPAPIBrowserTesterIsBroken() or | 102 is_broken=env.PPAPIBrowserTesterIsBroken() or |
| 102 env.Bit('running_on_valgrind')) | 103 env.Bit('running_on_valgrind')) |
| OLD | NEW |