Merge m-c to b2ginbound
authorWes Kocher <wkocher@mozilla.com>
Tue, 12 May 2015 12:04:01 -0700
changeset 274351 3a36c1675f912f020ebc60d265e09f9ee48b92d5
parent 274350 ea828c61a127ab51d016076359140e673569d02d (current diff)
parent 274256 42db79f3cd6ba7fd8e331a490da007904d88870d (diff)
child 274352 62d9b117c688edcf38349b197adde657aec75f47
child 274437 c5b1f90bb951b26c88742be9de87108c19a78690
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge m-c to b2ginbound
--- a/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
+++ b/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
@@ -27,21 +27,21 @@ reason = mar signing
 skip-if = os != 'win'
 [marCallbackAppSuccessPartial_win.js]
 skip-if = os != 'win'
 [marCallbackAppStageSuccessComplete_win.js]
 skip-if = os != 'win'
 [marCallbackAppStageSuccessPartial_win.js]
 skip-if = os != 'win'
 [marAppInUseSuccessComplete.js]
-skip-if = debug == true && toolkit == 'gonk'
-reason = bug 1163355
+skip-if = toolkit == 'gonk'
+reason = bug 1164150
 [marAppInUseStageSuccessComplete_unix.js]
-skip-if = os == 'win' || debug == true && toolkit == 'gonk'
-reason = bug 1163355
+skip-if = os == 'win' || toolkit == 'gonk'
+reason = bug 1164150
 [marAppInUseStageFailureComplete_win.js]
 skip-if = os != 'win'
 [marAppInUseFallbackStageFailureComplete_win.js]
 skip-if = os != 'win'
 [marFileLockedFailureComplete_win.js]
 skip-if = os != 'win'
 [marFileLockedFailurePartial_win.js]
 skip-if = os != 'win'
@@ -78,13 +78,13 @@ skip-if = os != 'win'
 skip-if = os != 'win'
 [marRMRFDirFileInUseFallbackStageFailurePartial_win.js]
 skip-if = os != 'win'
 [marAppApplyDirLockedStageFailure_win.js]
 skip-if = os != 'win'
 [marAppApplyUpdateAppBinInUseStageSuccess_win.js]
 skip-if = os != 'win'
 [marAppApplyUpdateSuccess.js]
-skip-if = debug == true && toolkit == 'gonk'
-reason = bug 1163354
+skip-if = toolkit == 'gonk'
+reason = bug 1164150
 [marAppApplyUpdateStageSuccess.js]
-skip-if = debug == true && toolkit == 'gonk'
-reason = bug 1163354
+skip-if = toolkit == 'gonk'
+reason = bug 1164150