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

This commit is contained in:
Henrik Skupin 2012-12-05 15:57:37 +01:00
parent 5e6401deba
commit e89a6bddbe
2 changed files with 12 additions and 5 deletions

View File

@ -5284,6 +5284,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)

View File

@ -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 and bug 818466 prevent us from running the following tests:
# test_getUserMedia_basicVideo.html \
# test_getUserMedia_basicAudio.html \
# test_getUserMedia_basicVideoAudio.html \
# mediaStreamPlayback.js \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk