bug 814807 - Pref on the gum automation in mozilla-central. r=jesup
authorJason Smith <jsmith@mozilla.com>
Tue, 01 Jan 2013 18:29:51 -0500
changeset 126522 c78f5379558a29a24b9e9e343a0754bffcc93073
parent 126521 8adae7474d9ee07861c5db8044b2bc28dd6fa698
child 126523 d8603eadb9d01231f3afe42cc81074b98394b56a
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs814807
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 814807 - Pref on the gum automation in mozilla-central. r=jesup
dom/media/tests/mochitest/Makefile.in
--- a/dom/media/tests/mochitest/Makefile.in
+++ b/dom/media/tests/mochitest/Makefile.in
@@ -5,31 +5,29 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-# Bug 814718 prevents us from running the following test:
-#  test_getUserMedia_basicVideo.html
-
 MOCHITEST_FILES = \
   test_getUserMedia_exceptions.html \
+  test_getUserMedia_basicVideo.html \
+  test_getUserMedia_basicAudio.html \
+  test_getUserMedia_basicVideoAudio.html \
   head.js \
   mediaStreamPlayback.js \
   pc.js \
   $(NULL)
 
 # The following tests are leaking and cannot be run by default yet
 ifdef MOZ_WEBRTC_LEAKING_TESTS
 MOCHITEST_FILES += \
-  test_getUserMedia_basicAudio.html \
-  test_getUserMedia_basicVideoAudio.html \
   test_peerConnection_basicAudio.html \
   test_peerConnection_basicAudioVideo.html \
   test_peerConnection_basicAudioVideoCombined.html \
   test_peerConnection_basicVideo.html \
   $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk