Bug 981780 - Disable some dom/media webrtc tests if webrtc isnt enabled. r=drno, a=sledru
authorLandry Breuil <landry@openbsd.org>
Fri, 09 May 2014 14:41:25 -0400
changeset 192287 3f803365277a
parent 192286 83f031a76d0a
child 192288 c5f7b330dd3a
push id3557
push userryanvm@gmail.com
push date2014-05-14 16:23 +0000
Treeherderresults
reviewersdrno, sledru
bugs981780
milestone30.0
Bug 981780 - Disable some dom/media webrtc tests if webrtc isnt enabled. r=drno, a=sledru
dom/media/tests/mochitest/moz.build
layout/tools/reftest/reftest.js
testing/crashtest/crashtests.list
--- a/dom/media/tests/mochitest/moz.build
+++ b/dom/media/tests/mochitest/moz.build
@@ -1,10 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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/.
 
-WEBRTC_SIGNALLING_TEST_MANIFESTS += ['steeplechase.ini']
+if CONFIG ['MOZ_WEBRTC']:
+	MOCHITEST_MANIFESTS += ['mochitest.ini']
+	WEBRTC_SIGNALLING_TEST_MANIFESTS += ['steeplechase.ini']
 
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
--- a/layout/tools/reftest/reftest.js
+++ b/layout/tools/reftest/reftest.js
@@ -627,16 +627,22 @@ function BuildConditionSandbox(aURL) {
     }
 
 #if MOZ_ASAN
     sandbox.AddressSanitizer = true;
 #else
     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__: {} };
     for each (var prop in [ "userAgent", "appName", "appVersion",
                             "vendor", "vendorSub",
                             "product", "productSub",
                             "platform", "oscpu", "language", "misc" ]) {
         sandbox.http[prop] = hh[prop];
--- a/testing/crashtest/crashtests.list
+++ b/testing/crashtest/crashtests.list
@@ -26,17 +26,17 @@ include ../../dom/base/crashtests/crasht
 include ../../dom/bindings/crashtests/crashtests.list
 include ../../dom/events/crashtests/crashtests.list
 include ../../dom/indexedDB/crashtests/crashtests.list
 include ../../dom/smil/crashtests/crashtests.list
 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
 
 include ../../editor/crashtests.list
 
 include ../../intl/lwbrk/src/crashtests/crashtests.list
 include ../../intl/uconv/crashtests/crashtests.list