diff -r 000000000000 -r 6474c204b198 toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,87 @@
+; This Source Code Form is subject to the terms of the Mozilla Public
+; License, v. 2.0. If a copy of the MPL was not distributed with this
+; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+; Tests that require the updater binary. These tests should never run on Android
+; which doesn't use the updater binary as other applications do and are excluded
+; from running the tests in the moz.build file.
+
+[DEFAULT]
+head = head_update.js
+tail =
+generated-files = head_update.js
+
+[marSuccessComplete.js]
+[marSuccessPartial.js]
+[marFailurePartial.js]
+[marStageSuccessComplete.js]
+skip-if = toolkit == 'gonk'
+reason = bug 820380
+[marStageSuccessPartial.js]
+[marVersionDowngrade.js]
+run-if = os == 'win'
+[marWrongChannel.js]
+run-if = os == 'win'
+[marStageFailurePartial.js]
+[marCallbackAppSuccessComplete_win.js]
+run-if = os == 'win'
+[marCallbackAppSuccessPartial_win.js]
+run-if = os == 'win'
+[marCallbackAppStageSuccessComplete_win.js]
+run-if = os == 'win'
+[marCallbackAppStageSuccessPartial_win.js]
+run-if = os == 'win'
+[marAppInUseSuccessComplete.js]
+skip-if = toolkit == 'gonk'
+[marAppInUseStageSuccessComplete_unix.js]
+run-if = os == 'linux' || os == 'sunos' || os == 'mac'
+[marAppInUseStageFailureComplete_win.js]
+run-if = os == 'win'
+[marAppInUseFallbackStageFailureComplete_win.js]
+run-if = os == 'win'
+[marFileLockedFailureComplete_win.js]
+run-if = os == 'win'
+[marFileLockedFailurePartial_win.js]
+run-if = os == 'win'
+[marFileLockedStageFailureComplete_win.js]
+run-if = os == 'win'
+[marFileLockedStageFailurePartial_win.js]
+run-if = os == 'win'
+[marFileLockedFallbackStageFailureComplete_win.js]
+run-if = os == 'win'
+[marFileLockedFallbackStageFailurePartial_win.js]
+run-if = os == 'win'
+[marFileInUseSuccessComplete_win.js]
+run-if = os == 'win'
+[marFileInUseSuccessPartial_win.js]
+run-if = os == 'win'
+[marRMRFDirFileInUseSuccessComplete_win.js]
+run-if = os == 'win'
+[marRMRFDirFileInUseSuccessPartial_win.js]
+run-if = os == 'win'
+[marFileInUseStageFailureComplete_win.js]
+run-if = os == 'win'
+[marFileInUseStageFailurePartial_win.js]
+run-if = os == 'win'
+[marRMRFDirFileInUseStageFailureComplete_win.js]
+run-if = os == 'win'
+[marRMRFDirFileInUseStageFailurePartial_win.js]
+run-if = os == 'win'
+[marFileInUseFallbackStageFailureComplete_win.js]
+run-if = os == 'win'
+[marFileInUseFallbackStageFailurePartial_win.js]
+run-if = os == 'win'
+[marRMRFDirFileInUseFallbackStageFailureComplete_win.js]
+run-if = os == 'win'
+[marRMRFDirFileInUseFallbackStageFailurePartial_win.js]
+run-if = os == 'win'
+reason = bug 820380
+[marAppApplyDirLockedStageFailure_win.js]
+run-if = os == 'win'
+[marAppApplyUpdateAppBinInUseStageSuccess_win.js]
+run-if = os == 'win'
+[marAppApplyUpdateSuccess.js]
+skip-if = toolkit == 'gonk'
+reason = bug 820380
+[marAppApplyUpdateStageSuccess.js]
+skip-if = toolkit == 'gonk'