Bug 1364374 - don't test flac on Android. draft
authorAlastor Wu <alwu@mozilla.com>
Fri, 12 May 2017 18:20:08 +0800
changeset 576828 5c0761974a373514bfe2628b7a4f719d997e3910
parent 575938 d8762cb967423618ff0a488f14745f60964e5c49
child 628321 1ee894251f5bbca56b203ecfea536d6f75ec5f9d
push id58494
push useralwu@mozilla.com
push dateFri, 12 May 2017 10:20:31 +0000
bugs1364374
milestone55.0a1
Bug 1364374 - don't test flac on Android. Now we don't support flac on fennec, only need to test it on non-android platforms. MozReview-Commit-ID: 9Qli9zSlNe9
dom/media/test/manifest.js
dom/media/test/mochitest.ini
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -770,27 +770,32 @@ var gMetadataTests = [
   },
   { name:"wave_metadata_bad_utf8.wav", tags: {
       name:"歌曲名稱",
       comments:"註解",
     }
   },
   { name:"wavedata_u8.wav", tags: { }
   },
-  { name:"flac-s24.flac", tags: {
-      ALBUM:"Seascapes",
-      TITLE:"(La Mer) - II. Jeux de vagues. Allegro",
-      COMPOSER:"Debussy, Claude",
-      TRACKNUMBER:"2/9",
-      DISCNUMBER:"1/1",
-      encoder:"Lavf57.41.100",
-    }
-  },
 ];
 
+// Now Fennec doesn't support flac, so only test it on non-android platforms.
+if (getAndroidVersion() < 0) {
+  gMetadataTests = gMetadataTests.concat([
+    { name:"flac-s24.flac", tags: {
+        ALBUM:"Seascapes",
+        TITLE:"(La Mer) - II. Jeux de vagues. Allegro",
+        COMPOSER:"Debussy, Claude",
+        TRACKNUMBER:"2/9",
+        DISCNUMBER:"1/1",
+        encoder:"Lavf57.41.100",
+      }
+    }]);
+}
+
 // Test files for Encrypted Media Extensions
 var gEMETests = [
   {
     name:"vp9 in mp4",
     tracks: [
       {
           name:"video",
           type:"video/mp4; codecs=\"vp9.0\"",
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@@ -865,17 +865,16 @@ skip-if = android_version == '17' # andr
 tags=msg
 [test_mediatrack_events.html]
 skip-if = android_version == '17' # android(bug 1232305)
 [test_mediatrack_parsing_ogg.html]
 skip-if = android_version == '17' # android(bug 1232305)
 [test_mediatrack_replay_from_end.html]
 skip-if = toolkit == 'android' # android(bug 1232305)
 [test_metadata.html]
-skip-if = toolkit == 'android' # android(bug 1232305)
 [test_mixed_principals.html]
 skip-if = toolkit == 'android' # bug 1309814, android(bug 1232305)
 [test_mozHasAudio.html]
 skip-if = toolkit == 'android' # android(bug 1232305)
 [test_multiple_mediastreamtracks.html]
 skip-if = android_version == '17' # android(bug 1232305)
 [test_networkState.html]
 skip-if = android_version == '17' # android(bug 1232305)