Bug 939048 - Part e: Move mochitests to manifests in dom/plugins/test/mochitest; r=jst

dom/plugins/test/mochitest/Makefile.in

@@ -1,71 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#  test_plugin_scroll_painting.html \ bug 596491
-ifeq ($(OS_ARCH),WINNT)
-MOCHITEST_FILES += \
-  test_windowed_invalidate.html \
-  $(NULL)
-
-# test_positioning.html \ disabled due to oddness, perhaps scrolling of the
-# mochitest window?
-endif
-
-ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-MOCHITEST_FILES += \
-  test_visibility.html \
-  $(NULL)
-
-ifneq ($(OS_ARCH),WINNT)
-MOCHITEST_CHROME_FILES += \
-  test_xulbrowser_plugin_visibility.xul \
-  xulbrowser_plugin_visibility.xul \
-  plugin_visibility_loader.html \
-  $(NULL)
-endif
-endif
-
-ifdef MOZ_CRASHREPORTER
-MOCHITEST_FILES += \
-  test_crashing.html \
-  $(filter disabled-for-random-orange--bug-566049, test_crashing2.html) \
-  test_hanging.html \
-  $(NULL)
-
-MOCHITEST_CHROME_FILES += \
-  test_crash_notify.xul \
-  test_crash_notify_no_report.xul \
-  test_crash_submit.xul \
-  test_hang_submit.xul \
-  $(NULL)
-  ifeq ($(OS_ARCH),WINNT)
-    MOCHITEST_CHROME_FILES += \
-      test_idle_hang.xul \
-      test_busy_hang.xul \
-      hang_test.js \
-      $(NULL)
-  endif
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-MOCHITEST_CHROME_FILES += \
-  test_convertpoint.xul \
-  $(NULL)
-
-MOCHITEST_FILES += \
-  test_cocoa_window_focus.html \
-  cocoa_window_focus.html \
-  test_cocoa_focus.html \
-  cocoa_focus.html \
-  test_queryContentsScaleFactor.html \
-  $(NULL)
-endif
-
-ifeq (,$(filter-out gtk2 gtk3,$(MOZ_WIDGET_TOOLKIT)))
-MOCHITEST_FILES += \
-		test_copyText.html \
-		test_crash_nested_loop.html \
-		$(NULL)
-endif

dom/plugins/test/mochitest/chrome.ini

@@ -1,13 +1,31 @@
 [DEFAULT]
 support-files =
+  hang_test.js
   privatemode_perwindowpb.xul
   utils.js
 
 [test_bug479979.xul]
 [test_bug751809.html]
+[test_busy_hang.xul]
+skip-if = (!crashreporter) || (os != "win")
 [test_clear_site_data.html]
+[test_convertpoint.xul]
+skip-if = toolkit != "cocoa"
+[test_crash_notify.xul]
+skip-if = !crashreporter
+[test_crash_notify_no_report.xul]
+skip-if = !crashreporter
+[test_crash_submit.xul]
+skip-if = !crashreporter
+[test_hang_submit.xul]
+skip-if = !crashreporter
+[test_idle_hang.xul]
+skip-if = (!crashreporter) || (os != "win")
 [test_npruntime.xul]
 [test_plugin_tag_clicktoplay.html]
 [test_privatemode_perwindowpb.xul]
 [test_refresh_navigator_plugins.html]
+[test_xulbrowser_plugin_visibility.xul]
+skip-if = (toolkit == "cocoa") || (os == "win")
+support-files = xulbrowser_plugin_visibility.xul plugin_visibility_loader.html
 [test_wmode.xul]

dom/plugins/test/mochitest/mochitest.ini

@@ -32,11 +32,27 @@ support-files =
 [test_bug813906.html]
 [test_bug854082.html]
 [test_bug863792.html]
+[test_cocoa_focus.html]
+skip-if = toolkit != "cocoa"
+support-files = cocoa_focus.html
+[test_cocoa_window_focus.html]
+skip-if = toolkit != "cocoa"
+support-files = cocoa_window_focus.html
 [test_cookies.html]
+[test_copyText.html]
+skip-if = (toolkit != "gtk2") && (toolkit != "gtk3")
+[test_crash_nested_loop.html]
+skip-if = (toolkit != "gtk2") && (toolkit != "gtk3")
+[test_crashing.html]
+skip-if = !crashreporter
+[test_crashing2.html]
+skip-if = (!crashreporter) || true # Bug 566049
 [test_defaultValue.html]
 [test_enumerate.html]
 [test_fullpage.html]
 [test_getauthenticationinfo.html]
+[test_hanging.html]
+skip-if = !crashreporter
 [test_instance_re-parent.html]
 [test_instance_unparent1.html]
 [test_instance_unparent2.html]
@@ -55,6 +71,8 @@ support-files =
 [test_npruntime_npninvokedefault.html]
 [test_npruntime_npnsetexception.html]
 [test_painting.html]
+[test_plugin_scroll_painting.html]
+skip-if = true # Bug 596491
 [test_pluginstream_asfile.html]
 [test_pluginstream_asfileonly.html]
 [test_pluginstream_err.html]
@@ -69,11 +87,19 @@ support-files =
 [test_pluginstream_src.html]
 [test_pluginstream_src_dynamic.html]
 [test_pluginstream_src_referer.html]
+[test_positioning.html]
+skip-if = true # disabled due to oddness, perhaps scrolling of the mochitest window?
 [test_propertyAndMethod.html]
+[test_queryContentsScaleFactor.html]
+skip-if = toolkit != "cocoa"
 [test_redirect_handling.html]
 [test_secondPlugin.html]
 [test_src_url_change.html]
 [test_streamNotify.html]
 [test_streamatclose.html]
 [test_twostreams.html]
+[test_windowed_invalidate.html]
+skip-if = os != "win"
+[test_visibility.html]
+skip-if = toolkit == "cocoa"
 [test_zero_opacity.html]

dom/plugins/test/mochitest/moz.build

@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-

dom/plugins/test/moz.build

@@ -6,7 +6,9 @@
 
 DIRS += ['testplugin']
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'cocoa', 'windows'):
-    TEST_DIRS += ['mochitest']
-
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'cocoa', 'windows'):
+    MOCHITEST_MANIFESTS += ['mochitest/mochitest.ini']
+    MOCHITEST_CHROME_MANIFESTS += ['mochitest/chrome.ini']
+