Bug 494769 - [MacOSX] mochitest-plain: test_wav_trailing.html (and others) intermittently triggers "malloc: *** error: can't allocate region"; Backout Av1-191: re-enable wave test(s) on MacOSX SeaMonkey.
authorSerge Gautherie <sgautherie.bz@free.fr>
Wed, 10 Jun 2009 17:12:19 +0200
changeset 25923 a339028e68c3cf59adb484e714fb65bcdaadfa5b
parent 25922 cf479e101ec275144e1e3e855288ac0abcfd2654
child 25924 1541e172b6f2eab564bb072b69694f54486dac06
child 25925 257f7cc34e526d2e2cb511b2b7c872bc06e0f05c
push id1675
push usersgautherie.bz@free.fr
push dateWed, 10 Jun 2009 15:13:00 +0000
bugs494769
milestone1.9.1pre
Bug 494769 - [MacOSX] mochitest-plain: test_wav_trailing.html (and others) intermittently triggers "malloc: *** error: can't allocate region"; Backout Av1-191: re-enable wave test(s) on MacOSX SeaMonkey.
content/media/video/test/Makefile.in
--- a/content/media/video/test/Makefile.in
+++ b/content/media/video/test/Makefile.in
@@ -153,54 +153,41 @@ ifdef MOZ_WAVE
 		test_bug465498.html \
 		test_bug468190_wav.html \
 		test_bug495145_wav.html \
 		test_can_play_type_wave.html \
 		test_paused_after_ended.html \
 		test_progress2.html \
 		test_progress4.html \
 		test_wav_8bit.html \
+		test_wav_ended1.html \
 		test_wav_ended2.html \
 		test_wav_list.html \
 		test_wav_onloadedmetadata.html \
 		test_wav_seek1.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_timeupdate1.html \
 		test_wav_timeupdate2.html \
+		test_wav_trailing.html \
 		test_wav_trunc.html \
 		test_wav_trunc_seek.html \
 		r11025_s16_c1.wav \
 		r11025_s16_c1_trailing.wav \
 		r11025_u8_c1.wav \
 		r11025_u8_c1_trunc.wav \
 		r16000_u8_c1_list.wav \
 		$(NULL)
 
-# Video test(s) disabled on MacOSX SeaMonkey (on 1.9.1). (Bug 494769)
-ifndef MOZ_SUITE
-_TEST_FILES += \
-		test_wav_ended1.html \
-		test_wav_trailing.html \
- 		$(NULL)
-else
-ifeq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-_TEST_FILES += \
-		test_wav_ended1.html \
-		test_wav_trailing.html \
-		$(NULL)
-endif
-endif # MOZ_SUITE
-
 else
 _TEST_FILES += \
 		test_can_play_type_no_wave.html \
 		$(NULL)
 endif
 
 # Disabled since we don't play Wave files standalone, for now
 #		test_wav_standalone.html