summaryrefslogtreecommitdiffstats
path: root/chrome/test/nacl_test_injection
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-23 18:14:56 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-23 18:14:56 +0000
commit93c0eadc4357a3c61e507ec47641fdab7c7c0223 (patch)
treec4a09c3c0f6788d110b16570864773be637b1721 /chrome/test/nacl_test_injection
parentbad8cbeb9dc9f772fb35b1107118d2e983eb32ab (diff)
downloadchromium_src-93c0eadc4357a3c61e507ec47641fdab7c7c0223.zip
chromium_src-93c0eadc4357a3c61e507ec47641fdab7c7c0223.tar.gz
chromium_src-93c0eadc4357a3c61e507ec47641fdab7c7c0223.tar.bz2
NaCl: Move NaCl's Breakpad tests into the Chromium repo
This imports tests/inbrowser_crash_test from the NaCl repo into the Chromium repo with a couple of minor changes: * crash_dump_tester.py is changed to locate native_client/tools/browser_tester via a new relative path. * I've renamed it from "inbrowser_crash_test" to "breakpad_crash_test" to make it more easily findable when searching for code related to Breakpad, and because "inbrowser" is redundant for code in the Chromium tree. (I think I originally omitted "Breakpad" from the directory name when the test lived on the NaCl side because the test was agnostic about the crash reporter implementation -- no Breakpad-specific code lived in the NaCl tree.) * Update copyright messages to say "Chromium Authors". Since the test tests Chromium, the Chromium repo is the right place for it. Having the test here will make it easier to debug the test's flakiness on 32-bit Windows. BUG=143413 TEST=nacl_integration Review URL: https://chromiumcodereview.appspot.com/10873019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl_test_injection')
-rwxr-xr-xchrome/test/nacl_test_injection/buildbot_nacl_integration.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
index f8dbf15..d97b5e7 100755
--- a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
+++ b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py
@@ -74,6 +74,11 @@ def Main(args):
# TODO(mseaborn): Change the tests to ignore the excess crash
# dump until we find out what is causing it.
tests_to_disable.extend([
+ 'run_breakpad_trusted_crash_in_startup_test',
+ 'run_breakpad_crash_in_syscall_test',
+ 'run_breakpad_untrusted_crash_test',
+ # TODO(mseaborn): Remove these when the test is removed from
+ # the NaCl tree.
'run_inbrowser_trusted_crash_in_startup_test',
'run_inbrowser_crash_in_syscall_test',
'run_inbrowser_untrusted_crash_test',