summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-09 07:21:27 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-09 07:21:27 +0000
commitddf1e966716892d95133975e8a562c09b287a767 (patch)
treea1177c3940111feb25c052b25a2c9995e196f87f /ppapi
parent8321b02f0b0328b3d15a1cfc437c3d09c7f7e18a (diff)
downloadchromium_src-ddf1e966716892d95133975e8a562c09b287a767.zip
chromium_src-ddf1e966716892d95133975e8a562c09b287a767.tar.gz
chromium_src-ddf1e966716892d95133975e8a562c09b287a767.tar.bz2
Breakpad test: Fix test disabling logic to refer to the correct flag name
Also disable the test with this flag on 64-bit Windows as well as 32-bit Windows, since we saw a failure on 64-bit Windows too. BUG=105778 TEST=nacl_integration TBR=ncbray@chromium.org Review URL: https://codereview.chromium.org/11818015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/native_client/tests/breakpad_crash_test/nacl.scons17
1 files changed, 8 insertions, 9 deletions
diff --git a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
index 06c4632..2dd6984 100644
--- a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
+++ b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
@@ -42,19 +42,18 @@ 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 fails on the second run
- # (for the SRPC PPAPI proxy) on the Windows XP (32-bit)
- # buildbots. The failures 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-srpc-proxy"
+ # 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
- env.Bit('build_x86_32') and
- '--enable-srpc-proxy' in
+ '--enable-nacl-srpc-proxy' in
os.environ.get('NACL_BROWSER_FLAGS', ''))))
# This crash in trusted code should produce a crash dump.