Merge m-c to b2ginbound

This commit is contained in:
Wes Kocher 2015-05-12 12:04:01 -07:00
commit 34ffd2ca91

View File

@ -32,11 +32,11 @@ 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]
@ -83,8 +83,8 @@ 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