Backed out changeset bb8075885195 (bug 950266) to see if it makes B2G mochitest-4 less perma-fail. a=backout
authorRyan VanderMeulen <ryanvm@gmail.com>
Sat, 01 Feb 2014 11:34:22 -0500
changeset 176184 3a4d6b21c0ea38cd40f7812b93bb631f79315a2d
parent 176183 668a24639afa09ae76482b088aef1dd372fd90b3
child 176185 0e9f3845a38677824844e7a81b77360a92b6f601
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs950266
milestone28.0a2
backs outbb8075885195e85b86be7d84cdd2887e5700f1a8
Backed out changeset bb8075885195 (bug 950266) to see if it makes B2G mochitest-4 less perma-fail. a=backout
b2g/confvars.sh
dom/ipc/PreallocatedProcessManager.cpp
dom/ipc/tests/mochitest.ini
testing/mochitest/b2g.json
toolkit/devtools/apps/tests/test_webapps_actor.html
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -52,11 +52,11 @@ MOZ_TIME_MANAGER=1
 
 MOZ_B2G_CERTDATA=1
 MOZ_PAY=1
 MOZ_TOOLKIT_SEARCH=
 MOZ_PLACES=
 MOZ_B2G=1
 
 if test "$OS_TARGET" = "Android"; then
-MOZ_NUWA_PROCESS=1
+MOZ_NUWA_PROCESS=
 fi
 MOZ_FOLD_LIBS=1
--- a/dom/ipc/PreallocatedProcessManager.cpp
+++ b/dom/ipc/PreallocatedProcessManager.cpp
@@ -304,17 +304,17 @@ PreallocatedProcessManagerImpl::PublishS
   MOZ_ASSERT(NS_IsMainThread());
 
   if (Preferences::GetBool("dom.ipc.processPriorityManager.testMode")) {
     AutoJSContext cx;
     nsCOMPtr<nsIMessageBroadcaster> ppmm =
       do_GetService("@mozilla.org/parentprocessmessagemanager;1");
     nsresult rv = ppmm->BroadcastAsyncMessage(
       NS_LITERAL_STRING("TEST-ONLY:nuwa-add-new-process"),
-      JS::NullHandleValue, JS::NullHandleValue, cx, 1);
+      JSVAL_NULL, JSVAL_NULL, cx, 1);
   }
 
   if (!mNuwaForkWaitTasks.IsEmpty()) {
     mNuwaForkWaitTasks.ElementAt(0)->Cancel();
     mNuwaForkWaitTasks.RemoveElementAt(0);
   }
 
   mSpareProcesses.AppendElement(aContent);
@@ -357,17 +357,17 @@ PreallocatedProcessManagerImpl::OnNuwaRe
                                              hal::PROCESS_PRIORITY_MASTER);
   mIsNuwaReady = true;
   if (Preferences::GetBool("dom.ipc.processPriorityManager.testMode")) {
     AutoJSContext cx;
     nsCOMPtr<nsIMessageBroadcaster> ppmm =
       do_GetService("@mozilla.org/parentprocessmessagemanager;1");
     nsresult rv = ppmm->BroadcastAsyncMessage(
       NS_LITERAL_STRING("TEST-ONLY:nuwa-ready"),
-      JS::NullHandleValue, JS::NullHandleValue, cx, 1);
+      JSVAL_NULL, JSVAL_NULL, cx, 1);
   }
   NuwaFork();
 }
 
 bool
 PreallocatedProcessManagerImpl::PreallocatedProcessReady()
 {
   return !mSpareProcesses.IsEmpty();
--- a/dom/ipc/tests/mochitest.ini
+++ b/dom/ipc/tests/mochitest.ini
@@ -1,2 +1,2 @@
 [test_NuwaProcessCreation.html]
-run-if = toolkit == 'gonk'
+skip-if = true # re-enable when nuwa is enabled.
--- a/testing/mochitest/b2g.json
+++ b/testing/mochitest/b2g.json
@@ -191,17 +191,16 @@
     "content/html/content/test/test_iframe_sandbox_popups_inheritance.html":"multiple concurrent window.open()s fail on B2G",
     "content/html/content/test/test_iframe_sandbox_modal.html":"modal tests fail on B2G",
 
     "content/html/content/test/test_iframe_sandbox_plugins.html":"plugins not supported",
     "content/html/content/test/test_object_plugin_nav.html":"plugins not supported",
     "content/html/document/test/test_bug741266.html":"needs control of popup window size",
     "docshell/test/navigation/test_popup-navigates-children.html":"Needs multiple window.open support, also uses docshelltreenode",
     "docshell/test/test_bug590573.html":"queryinterfaces into webnavigation, might suffer from something similar as bug 823022",
-    "docshell/test/navigation/test_bug430723.html":"apz race condition, see bug 965351",
     "dom/devicestorage/ipc/test_ipc.html":"nested ipc not working",
 
     "dom/indexedDB/ipc/test_ipc.html":"nested ipc not working",
     "dom/indexedDB/test/test_lowDiskSpace.html":"this needs probably modification for notifyObserversInParentProcess to be similar as pushPermissions",
 
     "content/base/test/test_object.html":"needs plugin support",
     "content/base/test/test_bug827160.html": "needs plugin support",
 
@@ -245,17 +244,16 @@
     "content/canvas/test/webgl/test_webgl_conformance_test_suite.html":"",
     "content/events/test/test_bug226361.xhtml":"",
     "content/events/test/test_bug238987.html":"",
     "content/events/test/test_bug409604.html":"",
     "content/events/test/test_bug457672.html":"",
     "content/events/test/test_bug574663.html":"",
     "content/events/test/test_bug607464.html":"",
     "content/events/test/test_wheel_default_action.html":"",
-    "dom/events/test/test_bug946632.html":"apz race condition, see bug 965351",
     "content/base/test/test_bug682592.html":"",	
     "content/html/document/test/test_bug369370.html":"",
     "content/svg/content/test/test_text_selection.html":"Mouse selection not workin on b2g",
     "content/svg/content/test/test_SVGAnimatedImageSMILDisabled.html":"",
     "content/xml/document/test/test_bug392338.html":"",
     "content/base/test/csp/test_bothCSPheaders.html":"",
     "content/base/test/test_bug383430.html":"",
     "content/base/test/test_bug422403-2.xhtml":"",
@@ -390,17 +388,16 @@
     "layout/base/tests/test_bug629838.html":"depends on plugins support",
     "layout/base/tests/test_mozPaintCount.html":"depends on plugins support",
     "layout/forms/test/test_bug348236.html":"select form control popup",
     "layout/forms/test/test_bug446663.html":"needs copy support",
     "layout/forms/test/test_bug564115.html":"times out on window.open and focus event",
     "layout/forms/test/test_bug571352.html":"shift-click multi-select not working?",
     "layout/forms/test/test_textarea_resize.html":"resizing textarea not available in b2g",
     "layout/forms/test/test_bug903715.html":"select elements don't use an in-page popup in B2G",
-    "layout/forms/test/test_bug564115.html":"apz race condition, see bug 965351",
     "layout/forms/test/test_listcontrol_search.html" : "select elements don't use an in-page popup in B2G",
     "layout/generic/test/test_bug392746.html":"ctrl mouse select not working in b2g",
     "layout/generic/test/test_bug470212.html":"shift mouse select not working in b2g",
     "layout/generic/test/test_bug514732.html":"times out, also on Android",
     "layout/generic/test/test_bug791616.html":"Target should not have scrolled - got 114.10000610351562, expected 115.39999389648438",
     "layout/generic/test/test_invalidate_during_plugin_paint.html":"plugins not supported",
     "layout/generic/test/test_page_scroll_with_fixed_pos.html":"opened window too small?",
     "layout/generic/test/test_plugin_focus.html":"plugins not supported",
--- a/toolkit/devtools/apps/tests/test_webapps_actor.html
+++ b/toolkit/devtools/apps/tests/test_webapps_actor.html
@@ -84,16 +84,17 @@ var steps = [
     // Because of wrapping issues, we can't use SpecialPowers.Cu.import to load
     // devtools jsm into mochitest scope. We end up not receiving
     // DebuggerClient.addListener callback arguments...
     let scriptUrl = SimpleTest.getTestFileURL("debugger-protocol-helper.js");
     mm = SpecialPowers.loadChromeScript(scriptUrl);
     installTestApp = function (url, appId, callback) {
       let installResponse, appObject;
       let installedEvent = false;
+      mm.sendAsyncMessage("install", {url: url, appId: appId});
       mm.addMessageListener("installed", function onInstalled(aResponse) {
         mm.removeMessageListener("installed", onInstalled);
         ok(true, "install request replied");
         installResponse = aResponse;
         checkEnd();
       });
       mm.addMessageListener("installed-event", function onInstalledEvent(aResponse) {
         mm.removeMessageListener("installed-event", onInstalledEvent);
@@ -105,17 +106,16 @@ var steps = [
         appObject = evt.application;
         ok(true, "mozApps.mgmt install event fired");
         checkEnd();
       };
       function checkEnd() {
         if (appObject && installResponse && installedEvent)
           callback(installResponse, appObject);
       }
-      mm.sendAsyncMessage("install", {url: url, appId: appId});
     };
     SpecialPowers.autoConfirmAppInstall(next);
   },
   function() {
     ok(true, "== TEST == Install packaged app");
     let appId = "test-app-id";
     let url = SimpleTest.getTestFileURL("data/app.zip");
     installTestApp(url, appId,