Bug 981780: disable some dom/media webrtc tests if webrtc isnt enabled r=drno

This commit is contained in:
Landry Breuil 2014-05-09 14:41:25 -04:00
Родитель 6e0a014641
Коммит c02fa98236
3 изменённых файлов: 10 добавлений и 4 удалений

Просмотреть файл

@ -4,7 +4,7 @@
# 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/.
WEBRTC_SIGNALLING_TEST_MANIFESTS += ['steeplechase.ini']
MOCHITEST_MANIFESTS += ['mochitest.ini']
if CONFIG ['MOZ_WEBRTC']:
MOCHITEST_MANIFESTS += ['mochitest.ini']
WEBRTC_SIGNALLING_TEST_MANIFESTS += ['steeplechase.ini']

Просмотреть файл

@ -660,6 +660,12 @@ function BuildConditionSandbox(aURL) {
sandbox.AddressSanitizer = false;
#endif
#if MOZ_WEBRTC
sandbox.webrtc = true;
#else
sandbox.webrtc = false;
#endif
var hh = CC[NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX + "http"].
getService(CI.nsIHttpProtocolHandler);
sandbox.http = { __exposedProps__: {} };

Просмотреть файл

@ -31,7 +31,7 @@ include ../../dom/xbl/crashtests/crashtests.list
include ../../dom/xslt/crashtests/crashtests.list
# Bug 811873 - mozRTCPeerConnection doesn't support remote browser yet
skip-if(B2G||browserIsRemote) include ../../dom/media/tests/crashtests/crashtests.list
skip-if(B2G||browserIsRemote||!webrtc) include ../../dom/media/tests/crashtests/crashtests.list
include ../../dom/src/offline/crashtests/crashtests.list
include ../../dom/src/jsurl/crashtests/crashtests.list