Merge m-c to fx-team
authorWes Kocher <wkocher@mozilla.com>
Tue, 12 May 2015 12:04:43 -0700
changeset 263037 de1fd9d0682a7c0b7301d02b92a88276f6e50faa
parent 263036 a83fbd4c96b835954b2e1cdceadf9adf1c1b14d9 (current diff)
parent 263023 42db79f3cd6ba7fd8e331a490da007904d88870d (diff)
child 263093 d476776d920d65eb6b53a94d01054945a5d7e437
child 263120 1bb87671b70a8620c77a028c9587be7f150e964b
push id8157
push userjlund@mozilla.com
push dateMon, 29 Jun 2015 20:36:23 +0000
treeherdermozilla-aurora@d480e05bd276 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone41.0a1
Merge m-c to fx-team
--- 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