Merge m-c to inbound.
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 08 Feb 2013 11:34:44 -0500
changeset 131207 1068ad428f7da778305e96e09db144555d868328
parent 131206 8e84efba19b97a155e3e2b2f6c563c4c0fbb616e (current diff)
parent 131145 469333ea459caf1b1c859ba04b866852b367e54b (diff)
child 131208 6e6c148b9c350025ea58a00e2250bd108c1f5be6
push id2323
push userbbajaj@mozilla.com
push dateMon, 01 Apr 2013 19:47:02 +0000
treeherdermozilla-beta@7712be144d91 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone21.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
Merge m-c to inbound.
--- a/dom/tests/mochitest/chrome/Makefile.in
+++ b/dom/tests/mochitest/chrome/Makefile.in
@@ -27,17 +27,16 @@ MOCHITEST_CHROME_FILES = \
 		test_geolocation.xul \
 		test_activation.xul \
 		window_activation.xul \
 		test_DOMWindowCreated.xul \
 		DOMWindowCreated_chrome.xul \
 		DOMWindowCreated_content.html \
 		test_sandbox_image.xul \
 		test_cyclecollector.xul \
-		test_resize_move_windows.xul \
 		test_popup_blocker_chrome.xul \
 		test_moving_xhr.xul \
 		test_nodesFromRect.html \
 		489127.html \
 		test_focus_docnav.xul \
 		window_focus_docnav.xul \
 		test_clonewrapper.xul \
 		test_moving_nodeList.xul \
@@ -64,16 +63,24 @@ MOCHITEST_CHROME_FILES = \
 
 ifeq (WINNT,$(OS_ARCH))
 MOCHITEST_CHROME_FILES += \
 		test_sizemode_attribute.xul \
 		sizemode_attribute.xul \
 		$(NULL)
 endif
 
+ifneq (Linux,$(OS_ARCH))
+MOCHITEST_FILES += \
+		test_resize_move_windows.xul \
+		$(NULL)
+else
+$(filter disabled-on-linux-for-timeouts--bug-834716, test_resize_move_windows.xul)
+endif
+
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOCHITEST_CHROME_FILES += \
 		test_MozEnteredDomFullscreen_event.xul \
 		$(NULL)
 else
 $(filter disabled-on-os-x-for-intermittent-failures--bug-798848, test_MozEnteredDomFullscreen_event.xul)
 endif