summaryrefslogtreecommitdiffstats
path: root/ppapi/native_client
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-11 18:06:35 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-11 18:06:35 +0000
commitf670c1b4c2bca2ddeb92715206d22d9f43b03460 (patch)
tree95673e1256cf963e212938ed0ed33d952641c9c4 /ppapi/native_client
parent127d3b3e05474d944d4a5575c8f6773fdeba0a89 (diff)
downloadchromium_src-f670c1b4c2bca2ddeb92715206d22d9f43b03460.zip
chromium_src-f670c1b4c2bca2ddeb92715206d22d9f43b03460.tar.gz
chromium_src-f670c1b4c2bca2ddeb92715206d22d9f43b03460.tar.bz2
Breakpad browser crash test: Disable check for .txt file on Windows for now
This check has turned out to be flaky. Also remove the earlier test-disabling logic which is no longer relevant since the tests aren't run with --enable-nacl-srpc-proxy any more. Although, bizarrely, the test failed more with --enable-nacl-srpc-proxy, it sometimes failed without it too. BUG=105778 BUG=169394 TEST=test runs as part of nacl_integration Review URL: https://codereview.chromium.org/11840007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/native_client')
-rwxr-xr-xppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py7
-rw-r--r--ppapi/native_client/tests/breakpad_crash_test/nacl.scons13
2 files changed, 8 insertions, 12 deletions
diff --git a/ppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py b/ppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py
index fa7733d..9e92686 100755
--- a/ppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py
+++ b/ppapi/native_client/tests/breakpad_crash_test/crash_dump_tester.py
@@ -141,6 +141,13 @@ def Main(cleanup_funcs):
'%r file\n' % (dump_file, second_file))
if not os.path.exists(second_file):
sys.stdout.write(msg)
+ # TODO(mseaborn): Investigate and remove this workaround.
+ if (options.expected_process_type_for_crash == 'browser' and
+ sys.platform == 'win32'):
+ sys.stdout.write('crash_dump_tester: Ignoring this error on Windows '
+ 'because the .txt file is sometimes missing -- '
+ 'see http://crbug.com/169394\n')
+ continue
failed = True
continue
# Check that the crash dump comes from the NaCl process.
diff --git a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
index 2dd6984..9fb9513 100644
--- a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
+++ b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
@@ -42,19 +42,8 @@ if env.Bit('host_windows') or env.Bit('host_mac'):
'--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', ''))))
+ env.Bit('running_on_valgrind')))
# This crash in trusted code should produce a crash dump.
crash_test_url = 'trusted_crash_in_startup.html'