Bug 818466 - Enable basic automated WebRTC gUM tests on Android. r=jesup
authorJason Smith <jsmith@mozilla.com>
Wed, 12 Dec 2012 16:40:57 -0500
changeset 115904 edd45de440ba0913b8226d4a47efe23962fe3003
parent 115903 1cc19f36ee663920b819411beda4652931571e10
child 115905 1c24a90750bf82ffea17e60d90184012d125cc64
push id19619
push useremorley@mozilla.com
push dateThu, 13 Dec 2012 16:03:07 +0000
treeherdermozilla-inbound@392421b0c470 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs818466
milestone20.0a1
first release with
nightly linux32
edd45de440ba / 20.0a1 / 20121213030751 / files
nightly linux64
edd45de440ba / 20.0a1 / 20121213030751 / files
nightly mac
edd45de440ba / 20.0a1 / 20121213030751 / files
nightly win32
edd45de440ba / 20.0a1 / 20121213030751 / files
nightly win64
edd45de440ba / 20.0a1 / 20121213030751 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 818466 - Enable basic automated WebRTC gUM tests on Android. r=jesup
dom/media/tests/mochitest/Makefile.in
dom/media/tests/mochitest/head.js
--- a/dom/media/tests/mochitest/Makefile.in
+++ b/dom/media/tests/mochitest/Makefile.in
@@ -5,26 +5,26 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-# Bug 814718 and bug 818466 prevent us from running the following tests:
+# Bug 814718 prevents us from running the following test:
 #  test_getUserMedia_basicVideo.html
-#  test_getUserMedia_basicAudio.html
-#  test_getUserMedia_basicVideoAudio.html
 
 MOCHITEST_FILES = \
   test_getUserMedia_exceptions.html \
   head.js \
   mediaStreamPlayback.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 \
   $(NULL)
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/media/tests/mochitest/head.js
+++ b/dom/media/tests/mochitest/head.js
@@ -14,19 +14,19 @@ var Cr = SpecialPowers.Cr;
  * @param {Boolean} desktopSupportedOnly specifies if the test currently
  *                                       is known to work on desktop only
  */
 function runTest(aCallback, desktopSupportedOnly) {
   SimpleTest.waitForExplicitFinish();
 
   // If this is a desktop supported test and we're on android or b2g,
   // indicate that the test is not supported and skip the test
-  if(desktopSupportedOnly && (navigator.platform === 'Android' ||
+  if(desktopSupportedOnly && (navigator.userAgent.indexOf('Android') > -1 ||
      navigator.platform === '')) {
-    ok(true, navigator.platform + ' currently not supported');
+    ok(true, navigator.userAgent + ' currently not supported');
     SimpleTest.finish();
   } else {
     SpecialPowers.pushPrefEnv({'set': [['media.peerconnection.enabled', true]]},
       aCallback);
   }
 }
 
 /**