Bug 466405 - Ogg and Wave specific mochitests should be hidden by appropriate build-time conditional - r=ted.mielczarek

content/media/video/test/Makefile.in

@@ -43,54 +43,72 @@ relativesrcdir  = content/media/video/test
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-_TEST_FILES = 	test_autoplay.html \
-                test_bug461281.html \
-                test_constants.html \
-                test_controls.html \
-                test_currentTime.html \
-                test_decoder_disable.html \
-                test_duration1.html \
-                test_ended1.html \
-                test_ended2.html \
-                test_networkState.html \
-                test_onloadedmetadata.html \
-                test_paused.html \
-                test_readyState.html \
-                test_seek1.html \
-                test_seek2.html \
-                test_seek3.html \
-                test_seek4.html \
-                test_seek5.html \
-                test_seek6.html \
-                test_seek7.html \
-                test_seek8.html \
-                test_standalone.html \
-                test_timeupdate1.html \
-                test_timeupdate2.html \
-                test_timeupdate3.html \
-                test_volume.html \
-                test_wav_8bit.html \
-                test_wav_ended1.html \
-                test_wav_seek3.html \
-                test_wav_seek4.html \
-                test_wav_seek5.html \
-                test_wav_seek6.html \
-                test_wav_seek7.html \
-                test_wav_seek8.html \
-                test_wav_seek_past_end.html \
-                test_wav_seek_then_play.html \
-                test_wav_trailing.html \
-                test_wav_trunc.html \
-                test_wav_trunc_seek.html \
-                320x240.ogg \
-                bug461281.ogg \
-                seek.ogg \
-                r11025_s16_c1.wav \
-                r11025_s16_c1_trailing.wav \
-                r11025_s16_c1_trunc.wav \
-                r11025_u8_c1.wav \
-#                test_bug448534.html \
-                $(NULL)
+_TEST_FILES = \
+		test_autoplay.html \
+		test_constants.html \
+		test_controls.html \
+		test_currentTime.html \
+		test_networkState.html \
+		test_paused.html \
+		test_readyState.html \
+		test_seek2.html \
+		test_volume.html \
+		$(NULL)
+
+ifdef MOZ_OGG
+_TEST_FILES += \
+		test_bug448534.html \
+		test_bug461281.html \
+		test_duration1.html \
+		test_ended1.html \
+		test_ended2.html \
+		test_onloadedmetadata.html \
+		test_seek1.html \
+		test_seek3.html \
+		test_seek4.html \
+		test_seek5.html \
+		test_seek6.html \
+		test_seek7.html \
+		test_seek8.html \
+		test_standalone.html \
+		test_timeupdate1.html \
+		test_timeupdate2.html \
+		test_timeupdate3.html \
+		320x240.ogg \
+		bug461281.ogg \
+		seek.ogg \
+		$(NULL)
+endif
+
+ifdef MOZ_WAVE
+_TEST_FILES += \
+		test_wav_8bit.html \
+		test_wav_ended1.html \
+		test_wav_seek3.html \
+		test_wav_seek4.html \
+		test_wav_seek5.html \
+		test_wav_seek6.html \
+		test_wav_seek7.html \
+		test_wav_seek8.html \
+		test_wav_seek_past_end.html \
+		test_wav_seek_then_play.html \
+		test_wav_trailing.html \
+		test_wav_trunc.html \
+		test_wav_trunc_seek.html \
+		r11025_s16_c1.wav \
+		r11025_s16_c1_trailing.wav \
+		r11025_s16_c1_trunc.wav \
+		r11025_u8_c1.wav \
+		$(NULL)
+endif
+
+ifdef MOZ_OGG
+ifdef MOZ_WAVE
+_TEST_FILES += \
+		test_decoder_disable.html \
+		$(NULL)
+endif
+endif
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)