Work around Bug 689580 - random orange due to the test-plugin-crashing.js tests on 64 bit Mac - by disabling those tests for now. r+a=Standard8
authorMike Conley <mconley@mozilla.com>
Fri, 07 Oct 2011 11:05:59 +0100
changeset 9281 2a43d7f6ab1c5edafedd248af95ed785fd6740fd
parent 9280 c2f9f8ee398bb2a7930fea87ca3f409ff4eff44e
child 9282 f1699243d205658bbf52ad7e30620e7dea5dfa53
push id230
push userbugzilla@standard8.plus.com
push dateTue, 08 Nov 2011 22:55:24 +0000
treeherdercomm-beta@63dad5648415 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs689580
Work around Bug 689580 - random orange due to the test-plugin-crashing.js tests on 64 bit Mac - by disabling those tests for now. r+a=Standard8
mail/test/mozmill/content-tabs/test-plugin-crashing.js
--- a/mail/test/mozmill/content-tabs/test-plugin-crashing.js
+++ b/mail/test/mozmill/content-tabs/test-plugin-crashing.js
@@ -78,19 +78,27 @@ function setupModule(module) {
   Services.prefs.setCharPref(kPluginCrashDocPref, kPluginCrashDocUrl);
 
   let Cc = Components.classes;
   let Ci = Components.interfaces;
 
   let crashReporter = Cc["@mozilla.org/toolkit/crash-reporter;1"]
                         .getService(Ci.nsICrashReporter);
 
+  /* Bug 689580 - these crash tests fail randomly on 64-bit OSX.  We'll
+   * disable them for now, until we can figure out what's going on.
+   */
+  Components.utils.import("resource://gre/modules/Services.jsm");
+  let is64BitOSX = (mc.mozmillModule.isMac &&
+                    Services.appinfo.XPCOMABI.match(/x86_64-/));
+
   // These tests are no good if the crash reporter is disabled, or if
   // we don't have out-of-process plugins enabled.
-  if (!plugins_run_in_separate_processes(mc) ||
+  if (is64BitOSX ||  // XXX Remove once Bug 689580 is resolved
+      !plugins_run_in_separate_processes(mc) ||
       !crashReporter.enabled) {
     let funcsToSkip = [test_can_crash_plugin,
                        test_crashed_plugin_notification_bar,
                        test_crashed_plugin_notification_inline];
 
     funcsToSkip.forEach(function(func) {
       func.__force_skip__ = true;
     });