Bug 759221 - 6/6 - disable failing media tests on Android - r=jmaher
authorBenoit Jacob <bjacob@mozilla.com>
Fri, 08 Jun 2012 13:41:45 -0400
changeset 100999 3b2f2ee46cc9998dfe348415aae172660388e533
parent 100998 c59fbb040bf366cd147f25341cff926a3928ea4a
child 101000 802fbaed034cf708d09500de35a59ef6d400e172
push id1316
push userakeybl@mozilla.com
push dateMon, 27 Aug 2012 22:37:00 +0000
treeherdermozilla-beta@db4b09302ee2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs759221
milestone16.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 759221 - 6/6 - disable failing media tests on Android - r=jmaher
content/media/test/Makefile.in
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -62,64 +62,56 @@ include $(topsrcdir)/config/rules.mk
 		seek11.js \
 		seek12.js \
 		seek13.js \
 		seekLies.sjs \
 		test_access_control.html \
 		test_audio1.html \
 		test_audio2.html \
 		test_autoplay.html \
-		test_autoplay_contentEditable.html \
-		test_buffered.html \
-		test_bug448534.html \
-		test_bug463162.xhtml \
 		test_bug465498.html \
 		test_bug493187.html \
 		test_bug495145.html \
 		test_bug495300.html \
 		test_bug686942.html \
 		test_can_play_type.html \
 		test_closing_connections.html \
 		test_constants.html \
 		test_controls.html \
 		test_currentTime.html \
 		test_decode_error.html \
-		test_decoder_disable.html \
 		test_defaultMuted.html \
 		test_delay_load.html \
 		test_error_on_404.html \
 		test_error_in_video_document.html \
 		test_info_leak.html \
 		test_load.html \
 		test_load_candidates.html \
 		test_load_same_resource.html \
 		test_load_source.html \
 		test_loop.html \
-		test_media_selection.html \
 		test_mozLoadFrom.html \
 		test_no_load_event.html \
 		test_networkState.html \
 		test_new_audio.html \
 		test_paused.html \
 		test_paused_after_ended.html \
 		test_play_events.html \
 		test_play_events_2.html \
 		test_played.html \
-		test_playback.html \
 		test_playback_errors.html \
 		test_seekable1.html \
 		test_preload_actions.html \
 		test_preload_attribute.html \
 		test_progress.html \
 		test_reactivate.html \
 		test_readyState.html \
 		test_replay_metadata.html \
 		test_seek.html \
 		test_seek2.html \
-		test_seekLies.html \
 		test_seek_out_of_range.html \
 		test_source.html \
 		test_source_write.html \
 	        test_source_null.html \
 		test_standalone.html \
 		test_streams_element_capture.html \
 		test_streams_element_capture_reset.html \
 		test_timeupdate_small_files.html \
@@ -127,16 +119,33 @@ include $(topsrcdir)/config/rules.mk
 		test_volume.html \
 		test_video_to_canvas.html \
 		use_large_cache.js \
 		test_audiowrite.html \
 		test_mozHasAudio.html \
 		test_source_media.html \
 		$(NULL)
 
+# Bug 759221
+# These tests are not built on Android because they were failing when we
+# enabled these tests on Android. The intent is to re-enable them as soon
+# as possible, and/or switch to a cleaner way to manage known-to-fail tests.
+ifneq ($(OS_TARGET),Android)
+_TEST_FILES = \
+		test_autoplay_contentEditable.html \
+		test_buffered.html \
+		test_bug448534.html \
+		test_bug463162.xhtml \
+		test_decoder_disable.html \
+		test_media_selection.html \
+		test_playback.html \
+		test_seekLies.html \
+		$(NULL)
+endif
+
 # Don't run in suite
 ifndef MOZ_SUITE
 _TEST_FILES += test_play_twice.html
 else
 $(warning test_play_twice.html is disabled pending investigation. Bug 598252)
 endif
 
 # These tests are disabled until we figure out random failures.
@@ -225,41 +234,50 @@ endif
 		bogus.duh \
 		$(NULL)
 
 # These tests contain backend-specific tests. Try to write backend
 # independent tests rather than adding to this list.
 ifdef MOZ_OGG
 _TEST_FILES += \
 		test_can_play_type_ogg.html \
+		noContentLength.sjs \
+		test_seekable3.html \
+		test_a4_tone.html \
+		file_audio_event_adopt_iframe.html \
+		test_audio_event_adopt.html \
+		test_referer.html \
+		test_bug726904.html \
+		$(NULL)
+
+# Bug 759221
+# These tests are not built on Android because they were failing when we
+# enabled these tests on Android. The intent is to re-enable them as soon
+# as possible, and/or switch to a cleaner way to manage known-to-fail tests.
+ifneq ($(OS_TARGET),Android)
+_TEST_FILES += \
+		test_bug686137.html \
 		test_contentDuration1.html \
 		test_contentDuration2.html \
 		test_contentDuration3.html \
 		test_contentDuration4.html \
 		test_contentDuration5.html \
 		test_contentDuration6.html \
 		test_contentDuration7.html \
 		contentDuration1.sjs \
 		contentDuration2.sjs \
 		contentDuration3.sjs \
 		contentDuration4.sjs \
 		contentDuration5.sjs \
 		contentDuration6.sjs \
 		contentDuration7.sjs \
-		noContentLength.sjs \
+		test_framebuffer.html \
 		test_seekable2.html \
-		test_seekable3.html \
-		test_a4_tone.html \
-		file_audio_event_adopt_iframe.html \
-		test_audio_event_adopt.html \
-		test_framebuffer.html \
-		test_referer.html \
-		test_bug726904.html \
-		test_bug686137.html \
 		$(NULL)
+endif
 else
 _TEST_FILES += \
 		test_can_play_type_no_ogg.html \
 		$(NULL)
 endif
 
 ifdef MOZ_WEBM
 _TEST_FILES += \
@@ -269,21 +287,31 @@ else
 _TEST_FILES += \
 		test_can_play_type_no_webm.html \
 		$(NULL)
 endif
 
 ifdef MOZ_WAVE
 _TEST_FILES += \
 		test_can_play_type_wave.html \
+		$(NULL)
+
+
+# Bug 759221
+# These tests are not built on Android because they were failing when we
+# enabled these tests on Android. The intent is to re-enable them as soon
+# as possible, and/or switch to a cleaner way to manage known-to-fail tests.
+ifneq ($(OS_TARGET),Android)
+_TEST_FILES += \
 		test_fragment_play.html \
 		test_fragment_noplay.html \
 		test_wave_data_u8.html \
 		test_wave_data_s16.html \
 		$(NULL)
+endif
 else
 _TEST_FILES += \
 		test_can_play_type_no_wave.html \
 		$(NULL)
 endif
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)