From 25a45239b480ece7c653d2645bbafc7cf3d6fe4d Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Fri, 3 Aug 2012 11:28:12 +0100
Subject: [PATCH] Bug 620598, Bug 661076 & Bug 687972 - Disable frequently
 intermittent media tests on Linux; r=cpearce

---
 content/media/test/Makefile.in | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in
index 48d62d77cb8..f02c8d82c44 100644
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -105,16 +105,13 @@ MOCHITEST_FILES = \
 		test_reactivate.html \
 		test_readyState.html \
 		test_replay_metadata.html \
-		test_seek.html \
 		test_seek2.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 \
 		test_too_many_elements.html \
 		test_volume.html \
 		test_video_to_canvas.html \
@@ -122,10 +119,6 @@ MOCHITEST_FILES = \
 		test_audiowrite.html \
 		test_mozHasAudio.html \
 		test_source_media.html \
-		$(NULL)
-
-# Bug 759221
-MOCHITEST_FILES += \
 		test_autoplay_contentEditable.html \
 		test_buffered.html \
 		test_bug448534.html \
@@ -136,6 +129,19 @@ MOCHITEST_FILES += \
 		test_seekLies.html \
 		$(NULL)
 
+# Tests disabled on Linux for frequent intermittent failures
+ifneq (Linux,$(OS_ARCH))
+MOCHITEST_FILES += \
+		test_seek.html \
+		test_seek_out_of_range.html \
+		test_timeupdate_small_files.html \
+		$(NULL)
+else
+$(warning test_seek.html is disabled on Linux for timeouts. Bug 620598)
+$(warning test_seek_out_of_range.html is disabled on Linux for timeouts. Bug 661076)
+$(warning test_timeupdate_small_files.html is disabled on Linux for timeouts. Bug 687972)
+endif
+
 # Don't run in suite
 ifndef MOZ_SUITE
 MOCHITEST_FILES += test_play_twice.html