Bug 817709 - Global flag to conditionally enable leaking mochitests. r=jesup

--HG--
extra : rebase_source : 08445b394ef810ac0be430298000a137c4cbd49b

configure.in

@@ -5270,6 +5270,7 @@ dnl enable once PeerConnection lands
 fi
 
 AC_SUBST(MOZ_WEBRTC)
+AC_SUBST(MOZ_WEBRTC_LEAKING_TESTS)
 AC_SUBST(MOZ_WEBRTC_SIGNALING)
 AC_SUBST(MOZ_PEERCONNECTION)
 AC_SUBST(MOZ_WEBRTC_IN_LIBXUL)

dom/media/tests/mochitest/Makefile.in

@@ -10,14 +10,20 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-# TODO: When bug 814718 and bug 814721 are fixed, add the following files:
-#          test_getUserMedia_basicVideo.html
-#          test_getUserMedia_basicAudio.thml
-#          test_getUserMedia_basicVideoAudio.html
-#          mediaStreamPlayback.js
 MOCHITEST_FILES = \
   test_getUserMedia_exceptions.html \
   head.js \
   $(NULL)
 
+# The following tests are leaking and cannot be run by default yet
+ifdef MOZ_WEBRTC_LEAKING_TESTS
+MOCHITEST_FILES += \
+# Bug 814718 prevents us from runnig the following tests:
+#  test_getUserMedia_basicVideo.html \
+#  test_getUserMedia_basicAudio.html \
+#  test_getUserMedia_basicVideoAudio.html \
+#  mediaStreamPlayback.js \
+  $(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk