Back out eb5f24ea495b (bug 950266) for marionette-webapi and debug mochitest-6 bustage
authorPhil Ringnalda <philringnalda@gmail.com>
Tue, 14 Jan 2014 20:32:13 -0800
changeset 163487 a5f0a97f909795b82565a824d3e28b8b119ec245
parent 163486 5147e502d36aa1087d78a55051904ccae9333470
child 163488 1eeb754bda29fbf3afa8c3b56520ef6de49aeb4e
push idunknown
push userunknown
push dateunknown
bugs950266
milestone29.0a1
backs outeb5f24ea495b62a4c381b9b3c9dbe16b1beb8cc6
Back out eb5f24ea495b (bug 950266) for marionette-webapi and debug mochitest-6 bustage
b2g/confvars.sh
dom/ipc/tests/mochitest.ini
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -52,13 +52,13 @@ 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
 
 MOZ_JSDOWNLOADS=1
--- 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.