Bug 1138063 - Fix up most of the manual test staging rules in c-c; r=jcranmer,callek
authorBrian O'Keefe <bokeefe@alum.wpi.edu>
Sat, 11 Apr 2015 23:37:32 +0800
changeset 22402 de2df507d8e7df66646c21673561964982832a0c
parent 22401 f03d99c19a754715de06b5641cfc1be54c63e39c
child 22403 d2a5e29e29c4d5fbec72427a22c062a7dc5c00e8
push id1420
push usermbanner@mozilla.com
push dateMon, 29 Jun 2015 20:47:24 +0000
treeherdercomm-beta@b3db00bb24e8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer, callek
bugs1138063
Bug 1138063 - Fix up most of the manual test staging rules in c-c; r=jcranmer,callek
mail/test/mozmill/Makefile.in
mail/test/mozmill/moz.build
mailnews/Makefile.in
mailnews/moz.build
suite/browser/moz.build
suite/browser/test/Makefile.in
suite/browser/test/browser/browser.ini
suite/browser/test/chrome/chrome.ini
suite/browser/test/mochitest/mochitest.ini
suite/browser/test/moz.build
suite/common/dataman/tests/Makefile.in
suite/common/dataman/tests/browser.ini
suite/common/dataman/tests/moz.build
suite/common/downloads/tests/Makefile.in
suite/common/downloads/tests/browser/browser.ini
suite/common/downloads/tests/chrome/chrome.ini
suite/common/downloads/tests/moz.build
suite/common/moz.build
suite/common/places/tests/Makefile.in
suite/common/places/tests/browser/browser.ini
suite/common/places/tests/chrome/chrome.ini
suite/common/places/tests/moz.build
suite/common/tests/browser/Makefile.in
suite/common/tests/browser/browser.ini
suite/common/tests/browser/moz.build
suite/common/tests/chrome/Makefile.in
suite/common/tests/chrome/chrome.ini
suite/common/tests/chrome/moz.build
suite/common/tests/moz.build
suite/common/tests/preferences/Makefile.in
suite/common/tests/preferences/browser.ini
suite/common/tests/preferences/moz.build
--- a/mail/test/mozmill/Makefile.in
+++ b/mail/test/mozmill/Makefile.in
@@ -14,28 +14,23 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 # We're installing to _tests/mozmill
 _DEST_DIR = $(DEPTH)/_tests/mozmill
 
 $(_DEST_DIR):
 	$(NSINSTALL) -D $@
 
-# Copy the mailnews and mail resources that we require.
-libs:: $(_DEST_DIR)
-	$(INSTALL) $(topsrcdir)/mailnews/test/resources/* $(_DEST_DIR)/resources
-	$(INSTALL) $(topsrcdir)/mailnews/test/fakeserver/* $(_DEST_DIR)/resources
-	$(INSTALL) $(topsrcdir)/mail/base/test/unit/resources/* $(_DEST_DIR)/resources
 
 # Copy MozMill and its dependencies over, and set up a virtualenv. The
 # virtualenv directory is outside because we don't want to bundle it up during
 # stage-package.
 VIRTUALENV_DIR = $(_DEST_DIR)/../mozmill-virtualenv
 mozmill-virtualenv: NSDISTMODE=copy
-mozmill-virtualenv:
+mozmill-virtualenv: $(_DEST_DIR)
 	$(INSTALL) $(topsrcdir)/mail/test/resources $(_DEST_DIR)
 	$(INSTALL) $(topsrcdir)/mozilla/python/virtualenv $(_DEST_DIR)/resources/
 	rm -rf $(VIRTUALENV_DIR) && \
 	mkdir $(VIRTUALENV_DIR) && \
 	unset MACOSX_DEPLOYMENT_TARGET && \
 	$(PYTHON) $(_DEST_DIR)/resources/installmozmill.py $(VIRTUALENV_DIR) $(MOZILLA_DIR)/testing/mozbase
 
 libs:: mozmill-virtualenv
--- a/mail/test/mozmill/moz.build
+++ b/mail/test/mozmill/moz.build
@@ -3,8 +3,15 @@
 # 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_HARNESS_FILES.mozmill += [
     'mozmilltests.list',
     'runtest.py',
     'runtestlist.py',
 ]
+
+TEST_HARNESS_FILES.mozmill.resources += [
+    '/mail/base/test/unit/resources/**',
+    '/mailnews/test/fakeserver/**',
+    '/mailnews/test/resources/**',
+]
+
deleted file mode 100644
--- a/mailnews/Makefile.in
+++ /dev/null
@@ -1,12 +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/.
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef ENABLE_TESTS
-libs::
-	$(INSTALL) $(wildcard $(srcdir)/test/resources/*.js) $(DEPTH)/_tests/xpcshell/mailnews/resources
-	$(INSTALL) $(wildcard $(srcdir)/test/data/*) $(DEPTH)/_tests/xpcshell/mailnews/data
-endif
--- a/mailnews/moz.build
+++ b/mailnews/moz.build
@@ -59,25 +59,33 @@ DIRS += [
 ]
 
 DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
 DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
 
 JAR_MANIFESTS += ['jar.mn']
 
 TESTING_JS_MODULES.mailnews += [
-	'test/fakeserver/auth.js',
-	'test/fakeserver/imapd.js',
-	'test/fakeserver/maild.js',
-	'test/fakeserver/nntpd.js',
-	'test/fakeserver/pop3d.js',
-	'test/fakeserver/smtpd.js',
-	'test/resources/IMAPpump.js',
-	'test/resources/localAccountUtils.js',
-	'test/resources/mailTestUtils.js',
-	'test/resources/MockFactory.js',
-	'test/resources/PromiseTestUtils.jsm',
+    'test/fakeserver/auth.js',
+    'test/fakeserver/imapd.js',
+    'test/fakeserver/maild.js',
+    'test/fakeserver/nntpd.js',
+    'test/fakeserver/pop3d.js',
+    'test/fakeserver/smtpd.js',
+    'test/resources/IMAPpump.js',
+    'test/resources/localAccountUtils.js',
+    'test/resources/mailTestUtils.js',
+    'test/resources/MockFactory.js',
+    'test/resources/PromiseTestUtils.jsm',
+]
+
+TEST_HARNESS_FILES.xpcshell.mailnews.data += [
+    '/mailnews/test/data/**',
+]
+
+TEST_HARNESS_FILES.xpcshell.mailnews.resources += [
+    '/mailnews/test/resources/**',
 ]
 
 JS_PREFERENCE_FILES += [
     'mailnews.js',
 ]
 
--- a/suite/browser/moz.build
+++ b/suite/browser/moz.build
@@ -1,14 +1,16 @@
 # 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/.
 
-TEST_DIRS += ['test']
+BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome/chrome.ini']
+MOCHITEST_MANIFESTS += ['test/mochitest/mochitest.ini']
 
 EXTRA_COMPONENTS += [
     'nsBrowserContentHandler.js',
     'nsTypeAheadFind.js',
     'SuiteBrowser.manifest',
 ]
 
 JAR_MANIFESTS += ['jar.mn']
deleted file mode 100644
--- a/suite/browser/test/Makefile.in
+++ /dev/null
@@ -1,104 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-
-_TEST_FILES =	test_feed_discovery.html \
-		feed_discovery.html \
-		test_bug395533.html \
-		bug395533-data.txt \
-		test_bug364677.html \
-		bug364677-data.xml \
-		bug364677-data.xml^headers^ \
-		test_registerHandler.html \
-		valid-feed.xml \
-		valid-unsniffable-feed.xml \
-		$(NULL)
-
-# test_contextmenu.html is disabled on Linux due to bug 513558
-ifneq (gtk2,$(MOZ_WIDGET_TOOLKIT))
-_TEST_FILES += \
-		test_contextmenu.html \
-		subtst_contextmenu.html \
-		ctxmenu-image.png \
-		audio.ogg \
-		video.ogg \
-		$(NULL)
-endif
-
-_BROWSER_FILES = \
-                 head.js \
-                 browser_bug329212.js \
-                 browser_bug409624.js \
-                 browser_bug413915.js \
-                 browser_bug427559.js \
-                 browser_bug435325.js \
-                 browser_bug519216.js \
-                 browser_bug561636.js \
-                 browser_bug562649.js \
-                 browser_bug581947.js \
-                 browser_bug585511.js \
-                 browser_bug595507.js \
-                 browser_bug623155.js \
-                 browser_fayt.js \
-                 browser_page_style_menu.js \
-                 blockPluginVulnerableNoUpdate.xml \
-                 blockPluginVulnerableUpdatable.xml \
-                 blockNoPlugins.xml \
-                 blockPluginHard.xml \
-                 browser_pluginCrashCommentAndURL.js \
-                 page_style_sample.html \
-                 browser_pageInfo.js \
-                 feed_tab.html \
-                 browser_pluginnotification.js \
-                 browser_pluginplaypreview.js \
-                 pluginCrashCommentAndURL.html \
-                 plugin_alternate_content.html \
-                 plugin_bug743421.html \
-                 plugin_bug749455.html \
-                 plugin_clickToPlayAllow.html \
-                 plugin_clickToPlayDeny.html \
-                 plugin_hidden_to_visible.html \
-                 plugin_unknown.html \
-                 plugin_test.html \
-                 plugin_test2.html \
-                 plugin_test3.html \
-                 plugin_two_types.html \
-                 plugin_both.html \
-                 plugin_both2.html \
-                 browser_popupNotification.js \
-                 browser_scope.js \
-                 browser_alltabslistener.js \
-                 alltabslistener.html \
-                 browser_relatedTabs.js \
-                 browser_selectTabAtIndex.js \
-                 title_test.svg \
-                 redirect_bug623155.sjs \
-                 browser_privatebrowsing_protocolhandler.js \
-                 browser_privatebrowsing_protocolhandler_page.html \
-    $(NULL)
-
-ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-_BROWSER_FILES += browser_bug462289.js
-endif
-
-_CHROME_FILES = \
-                 test_maxSniffing.html \
-    $(NULL)
-
-libs:: $(addprefix mochitest/, $(_TEST_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
-
-libs:: $(addprefix browser/, $(_BROWSER_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
-
-libs:: $(addprefix chrome/, $(_CHROME_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
new file mode 100644
--- /dev/null
+++ b/suite/browser/test/browser/browser.ini
@@ -0,0 +1,54 @@
+[DEFAULT]
+support-files =
+  head.js
+  blockPluginVulnerableNoUpdate.xml
+  blockPluginVulnerableUpdatable.xml
+  blockNoPlugins.xml
+  blockPluginHard.xml
+  page_style_sample.html
+  feed_tab.html
+  pluginCrashCommentAndURL.html
+  plugin_alternate_content.html
+  plugin_bug743421.html
+  plugin_bug749455.html
+  plugin_clickToPlayAllow.html
+  plugin_clickToPlayDeny.html
+  plugin_hidden_to_visible.html
+  plugin_unknown.html
+  plugin_test.html
+  plugin_test2.html
+  plugin_test3.html
+  plugin_two_types.html
+  plugin_both.html
+  plugin_both2.html
+  alltabslistener.html
+  title_test.svg
+  redirect_bug623155.sjs
+
+[browser_alltabslistener.js]
+[browser_bug329212.js]
+[browser_bug409624.js]
+[browser_bug413915.js]
+[browser_bug427559.js]
+[browser_bug435325.js]
+[browser_bug462289.js]
+skip-if = toolkit == 'cocoa'
+[browser_bug519216.js]
+[browser_bug561636.js]
+[browser_bug562649.js]
+[browser_bug581947.js]
+[browser_bug585511.js]
+[browser_bug595507.js]
+[browser_bug623155.js]
+[browser_fayt.js]
+[browser_pageInfo.js]
+[browser_page_style_menu.js]
+[browser_pluginCrashCommentAndURL.js]
+[browser_pluginnotification.js]
+[browser_pluginplaypreview.js]
+[browser_popupNotification.js]
+[browser_privatebrowsing_protocolhandler.js]
+support-files = browser_privatebrowsing_protocolhandler_page.html
+[browser_relatedTabs.js]
+[browser_scope.js]
+[browser_selectTabAtIndex.js]
new file mode 100644
--- /dev/null
+++ b/suite/browser/test/chrome/chrome.ini
@@ -0,0 +1,1 @@
+[test_maxSniffing.html]
new file mode 100644
--- /dev/null
+++ b/suite/browser/test/mochitest/mochitest.ini
@@ -0,0 +1,11 @@
+[test_bug364677.html]
+support_files = bug364677-data.xml bug364677-data.xml^headers^
+[test_bug395533.html]
+support_files = bug395533-data.txt
+[test_feed_discovery.html]
+support_files = feed_discovery.html
+[test_registerHandler.html ]
+support_files = valid-feed.xml valid-unsniffable-feed.xml
+[test_contextmenu.html]
+support_files = subtst_contextmenu.html ctxmenu-image.png audio.ogg video.ogg
+skip-if = toolkit == 'gtk2' || toolkit == 'gtk3' # disabled on Linux due to bug 513558
deleted file mode 100644
--- a/suite/browser/test/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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/.
deleted file mode 100644
--- a/suite/common/dataman/tests/Makefile.in
+++ /dev/null
@@ -1,22 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(topsrcdir)/config/rules.mk
-
-_BROWSER_FILES = \
-    browser_dataman_basics.js \
-    dataman_storage.appcache \
-    dataman_storage.appcache^headers^ \
-    dataman_storage.html \
-    browser_dataman_callviews.js \
-    $(NULL)
-
-libs:: $(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
new file mode 100644
--- /dev/null
+++ b/suite/common/dataman/tests/browser.ini
@@ -0,0 +1,8 @@
+[DEFAULT]
+support-files = 
+  dataman_storage.appcache
+  dataman_storage.appcache^headers^
+  dataman_storage.html
+
+[browser_dataman_basics.js]
+[browser_dataman_callviews.js]
deleted file mode 100644
--- a/suite/common/dataman/tests/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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/.
deleted file mode 100644
--- a/suite/common/downloads/tests/Makefile.in
+++ /dev/null
@@ -1,43 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-
-_CHROME_FILES = \
-    test_action_keys_respect_focus.xul \
-    test_basic_functionality.xul \
-    test_cleanup_search.xul \
-    test_clear_button_disabled.xul \
-    test_close_download_manager.xul \
-    test_delete_key_cancels.xul \
-    test_delete_key_removes.xul \
-    test_drag.xul \
-    test_enter_dblclick_opens.xul \
-    test_multi_select.xul \
-    test_multiword_search.xul \
-    test_open_properties.xul \
-    test_removeDownload_updates_ui.xul \
-    test_search_clearlist.xul \
-    test_search_keys.xul \
-    test_select_all.xul \
-    test_space_key_pauses_resumes.xul \
-    test_space_key_retries.xul \
-    test_ui_stays_open_on_alert_clickback.xul \
-    $(NULL)
-
-_BROWSER_FILES = browser_nsISuiteDownloadManagerUI.js \
-    $(NULL)
-
-libs:: $(addprefix chrome/, $(_CHROME_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
-
-libs:: $(addprefix browser/, $(_BROWSER_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
new file mode 100644
--- /dev/null
+++ b/suite/common/downloads/tests/browser/browser.ini
@@ -0,0 +1,1 @@
+[browser_nsISuiteDownloadManagerUI.js]
new file mode 100644
--- /dev/null
+++ b/suite/common/downloads/tests/chrome/chrome.ini
@@ -0,0 +1,19 @@
+[test_action_keys_respect_focus.xul]
+[test_basic_functionality.xul]
+[test_cleanup_search.xul]
+[test_clear_button_disabled.xul]
+[test_close_download_manager.xul]
+[test_delete_key_cancels.xul]
+[test_delete_key_removes.xul]
+[test_drag.xul]
+[test_enter_dblclick_opens.xul]
+[test_multiword_search.xul]
+[test_multi_select.xul]
+[test_open_properties.xul]
+[test_removeDownload_updates_ui.xul]
+[test_search_clearlist.xul]
+[test_search_keys.xul]
+[test_select_all.xul]
+[test_space_key_pauses_resumes.xul]
+[test_space_key_retries.xul]
+[test_ui_stays_open_on_alert_clickback.xul]
\ No newline at end of file
deleted file mode 100644
--- a/suite/common/downloads/tests/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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/.
--- a/suite/common/moz.build
+++ b/suite/common/moz.build
@@ -3,23 +3,33 @@
 # 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/.
 
 DIRS += [
     'public',
     'src',
 ]
 
-TEST_DIRS += [
-    'tests',
-    'dataman/tests',
-    'downloads/tests',
-    'places/tests',
+BROWSER_CHROME_MANIFESTS += [
+    'dataman/tests/browser.ini',
+    'downloads/tests/browser/browser.ini',
+    'places/tests/browser/browser.ini',
+    'tests/browser/browser.ini',
+    'tests/preferences/browser.ini',
 ]
 
+MOCHITEST_CHROME_MANIFESTS += [
+    'downloads/tests/chrome/chrome.ini',
+    'places/tests/chrome/chrome.ini',
+    'tests/chrome/chrome.ini',
+]
+
+XPCSHELL_TESTS_MANIFESTS += ['places/tests/unit/xpcshell.ini']
+
+
 JAR_MANIFESTS += ['jar.mn']
 
 # DEFINES for preprocessing
 # Use suite/common/app-license.html as input when generating 
 # chrome://content/communicator/license.html to override 
 # chrome://global/content/license.html (about:license)
 DEFINES['APP_LICENSE_BLOCK'] = '%s/app-license.html' % SRCDIR
 
deleted file mode 100644
--- a/suite/common/places/tests/Makefile.in
+++ /dev/null
@@ -1,45 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
-
-_CHROME_FILES = \
-    head.js \
-    test_treeview_date.xul \
-    test_bug485100-change-case-loses-tag.xul \
-    test_bug427633_no_newfolder_if_noip.xul \
-    test_0_multiple_left_pane.xul \
-    test_0_bug510634.xul \
-    test_bug549192.xul \
-    test_bug549491.xul \
-    $(NULL)
-
-_BROWSER_FILES = \
-    head.js \
-    browser_0_library_left_pane_migration.js \
-    browser_library_left_pane_fixnames.js \
-    browser_425884.js \
-    browser_423515.js \
-    browser_sort_in_library.js \
-    browser_library_open_leak.js \
-    browser_library_left_pane_commands.js \
-    browser_drag_bookmarks_on_toolbar.js \
-    browser_library_views_liveupdate.js \
-    browser_library_infoBox.js \
-    $(NULL)
-
-libs:: $(addprefix chrome/, $(_CHROME_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
-
-libs:: $(addprefix browser/, $(_BROWSER_FILES))
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
new file mode 100644
--- /dev/null
+++ b/suite/common/places/tests/browser/browser.ini
@@ -0,0 +1,14 @@
+[DEFAULT]
+support-files =
+  head.js
+
+[browser_0_library_left_pane_migration.js]
+[browser_423515.js]
+[browser_425884.js]
+[browser_drag_bookmarks_on_toolbar.js]
+[browser_library_infoBox.js]
+[browser_library_left_pane_commands.js]
+[browser_library_left_pane_fixnames.js]
+[browser_library_open_leak.js]
+[browser_library_views_liveupdate.js]
+[browser_sort_in_library.js]
new file mode 100644
--- /dev/null
+++ b/suite/common/places/tests/chrome/chrome.ini
@@ -0,0 +1,11 @@
+[DEFAULT]
+support-files =
+  head.js
+
+[test_0_bug510634.xul]
+[test_0_multiple_left_pane.xul]
+[test_bug427633_no_newfolder_if_noip.xul]
+[test_bug485100-change-case-loses-tag.xul]
+[test_bug549192.xul]
+[test_bug549491.xul]
+[test_treeview_date.xul]
deleted file mode 100644
--- a/suite/common/places/tests/moz.build
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/.
-
-XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
-
deleted file mode 100644
--- a/suite/common/tests/browser/Makefile.in
+++ /dev/null
@@ -1,90 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-
-_BROWSER_FILES = \
-	head.js \
-	browser_form_restore_events.js \
-	browser_form_restore_events_sample.html \
-	browser_339445.js \
-	browser_339445_sample.html \
-	browser_345898.js \
-	browser_346337.js \
-	browser_346337_sample.html \
-	browser_350525.js \
-	browser_354894.js \
-	browser_367052.js \
-	browser_393716.js \
-	browser_394759_basic.js \
-	browser_394759_behavior.js \
-	browser_408470.js \
-	browser_408470_sample.html \
-	browser_423132.js \
-	browser_423132_sample.html \
-	browser_bug431826.js \
-	browser_447951.js \
-	browser_447951_sample.html \
-	browser_448741.js \
-	browser_454908.js \
-	browser_454908_sample.html \
-	browser_456342.js \
-	browser_456342_sample.xhtml \
-	browser_461634.js \
-	browser_463206.js \
-	browser_463206_sample.html \
-	browser_465215.js \
-	browser_465223.js \
-	browser_466937.js \
-	browser_466937_sample.html \
-	browser_477657.js \
-	browser_480893.js \
-	browser_483330.js \
-	browser_485482.js \
-	browser_485482_sample.html \
-	browser_490040.js \
-	browser_491168.js \
-	browser_493467.js \
-	browser_500328.js \
-	browser_514751.js \
-	browser_522545.js \
-	browser_524745.js \
-	browser_526613.js \
-	browser_528776.js \
-	browser_581937.js \
-	browser_586068-cascaded_restore.js \
-	browser_597315.js \
-	browser_597315_index.html \
-	browser_597315_a.html \
-	browser_597315_b.html \
-	browser_597315_c.html \
-	browser_597315_c1.html \
-	browser_597315_c2.html \
-	browser_607016.js \
-	browser_615394-SSWindowState_events.js \
-	browser_625257.js \
-	browser_636279.js \
-	browser_637020.js \
-	browser_637020_slow.sjs \
-	browser_665702-state_session.js \
-	browser_687710.js \
-	browser_687710_2.js \
-	browser_694378.js \
-	browser_isempty.js \
-	browser_markPageAsFollowedLink.js \
-	framedPage.html \
-	frameLeft.html \
-	frameRight.html \
-	$(NULL)
-
-libs:: $(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
new file mode 100644
--- /dev/null
+++ b/suite/common/tests/browser/browser.ini
@@ -0,0 +1,75 @@
+[DEFAULT]
+support-files =
+  head.js
+  framedPage.html
+  frameLeft.html
+  frameRight.html
+
+[browser_339445.js]
+support-files = browser_339445_sample.html
+[browser_345898.js]
+[browser_346337.js]
+support-files = browser_346337_sample.html
+[browser_350525.js]
+[browser_354894.js]
+[browser_367052.js]
+[browser_393716.js]
+[browser_394759_basic.js]
+[browser_394759_behavior.js]
+[browser_408470.js]
+support-files = browser_408470_sample.html
+[browser_423132.js]
+support-files = browser_423132_sample.html
+[browser_447951.js]
+support-files = browser_447951_sample.html
+[browser_448741.js]
+[browser_454908.js]
+support-files = browser_454908_sample.html
+[browser_456342.js]
+support-files = browser_456342_sample.xhtml
+[browser_461634.js]
+[browser_463206.js]
+support-files = browser_463206_sample.html
+[browser_465215.js]
+[browser_465223.js]
+[browser_466937.js]
+support-files = browser_466937_sample.html
+[browser_477657.js]
+[browser_480893.js]
+[browser_483330.js]
+[browser_485482.js]
+support-files = browser_485482_sample.html
+[browser_490040.js]
+[browser_491168.js]
+[browser_493467.js]
+[browser_500328.js]
+[browser_514751.js]
+[browser_522545.js]
+[browser_524745.js]
+[browser_526613.js]
+[browser_528776.js]
+[browser_581937.js]
+[browser_586068-cascaded_restore.js]
+[browser_597315.js]
+support-files = 
+    browser_597315_a.html
+    browser_597315_b.html
+    browser_597315_c.html
+    browser_597315_c1.html
+    browser_597315_c2.html
+    browser_597315_index.html
+[browser_607016.js]
+[browser_615394-SSWindowState_events.js]
+[browser_625257.js]
+[browser_636279.js]
+[browser_637020.js]
+support-files = browser_637020_slow.sjs
+[browser_665702-state_session.js]
+[browser_687710.js]
+[browser_687710_2.js]
+[browser_694378.js]
+[browser_bug431826.js]
+[browser_form_restore_events.js]
+support-files = browser_form_restore_events_sample.html
+[browser_isempty.js]
+[browser_markPageAsFollowedLink.js]
deleted file mode 100644
--- a/suite/common/tests/browser/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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/.
deleted file mode 100644
--- a/suite/common/tests/chrome/Makefile.in
+++ /dev/null
@@ -1,20 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-
-_TEST_FILES = 	test_idcheck.xul \
-		$(topsrcdir)/mailnews/test/resources/mailTestUtils.js \
-		$(NULL)
-
-libs:: $(_TEST_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/chrome/$(relativesrcdir)
new file mode 100644
--- /dev/null
+++ b/suite/common/tests/chrome/chrome.ini
@@ -0,0 +1,2 @@
+[test_idcheck.xul]
+support-files = /mailnews/test/resources/mailTestUtils.js
deleted file mode 100644
--- a/suite/common/tests/chrome/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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/.
deleted file mode 100644
--- a/suite/common/tests/moz.build
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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/.
-
-TEST_DIRS += [
-    'browser',
-    'chrome',
-    'preferences',
-]
-
deleted file mode 100644
--- a/suite/common/tests/preferences/Makefile.in
+++ /dev/null
@@ -1,19 +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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-
-_BROWSER_FILES = \
-    browser_bug410900.js \
-    $(NULL)
-
-libs::	$(_BROWSER_FILES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
new file mode 100644
--- /dev/null
+++ b/suite/common/tests/preferences/browser.ini
@@ -0,0 +1,1 @@
+[browser_bug410900.js]
deleted file mode 100644
--- a/suite/common/tests/preferences/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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/.