Backed out changeset 39a308770f17 (bug 920223)
authorEd Morley <emorley@mozilla.com>
Mon, 30 Sep 2013 12:50:02 +0100
changeset 149255 1c8514e27576d8b74487523b824c6d10fa160820
parent 149254 d884bd18873c0b20efd2cb21eb9635cd30a56e30
child 149256 32cccb8b64e8538db46c5a6ccac3036b7fdf3a1a
push id25380
push userryanvm@gmail.com
push dateMon, 30 Sep 2013 20:16:36 +0000
treeherdermozilla-central@1332fc1c15e1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs920223
milestone27.0a1
backs out39a308770f17c6b4843994642f888d4c11f4be52
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
Backed out changeset 39a308770f17 (bug 920223)
accessible/tests/mochitest/actions/Makefile.in
accessible/tests/mochitest/actions/a11y.ini
accessible/tests/mochitest/actions/moz.build
accessible/tests/mochitest/attributes/Makefile.in
accessible/tests/mochitest/attributes/a11y.ini
accessible/tests/mochitest/attributes/moz.build
accessible/tests/mochitest/bounds/Makefile.in
accessible/tests/mochitest/bounds/a11y.ini
accessible/tests/mochitest/bounds/moz.build
accessible/tests/mochitest/editabletext/Makefile.in
accessible/tests/mochitest/editabletext/a11y.ini
accessible/tests/mochitest/editabletext/moz.build
accessible/tests/mochitest/elm/Makefile.in
accessible/tests/mochitest/elm/a11y.ini
accessible/tests/mochitest/elm/moz.build
accessible/tests/mochitest/events/Makefile.in
accessible/tests/mochitest/events/a11y.ini
accessible/tests/mochitest/events/moz.build
accessible/tests/mochitest/focus/Makefile.in
accessible/tests/mochitest/focus/a11y.ini
accessible/tests/mochitest/focus/moz.build
accessible/tests/mochitest/hittest/Makefile.in
accessible/tests/mochitest/hittest/a11y.ini
accessible/tests/mochitest/hittest/moz.build
accessible/tests/mochitest/hyperlink/Makefile.in
accessible/tests/mochitest/hyperlink/a11y.ini
accessible/tests/mochitest/hyperlink/moz.build
accessible/tests/mochitest/hypertext/Makefile.in
accessible/tests/mochitest/hypertext/a11y.ini
accessible/tests/mochitest/hypertext/moz.build
accessible/tests/mochitest/jsat/Makefile.in
accessible/tests/mochitest/jsat/a11y.ini
accessible/tests/mochitest/jsat/moz.build
accessible/tests/mochitest/name/Makefile.in
accessible/tests/mochitest/name/a11y.ini
accessible/tests/mochitest/name/moz.build
accessible/tests/mochitest/pivot/Makefile.in
accessible/tests/mochitest/pivot/a11y.ini
accessible/tests/mochitest/pivot/moz.build
accessible/tests/mochitest/relations/Makefile.in
accessible/tests/mochitest/relations/a11y.ini
accessible/tests/mochitest/relations/moz.build
accessible/tests/mochitest/role/Makefile.in
accessible/tests/mochitest/role/a11y.ini
accessible/tests/mochitest/role/moz.build
accessible/tests/mochitest/scroll/Makefile.in
accessible/tests/mochitest/scroll/a11y.ini
accessible/tests/mochitest/scroll/moz.build
accessible/tests/mochitest/selectable/Makefile.in
accessible/tests/mochitest/selectable/a11y.ini
accessible/tests/mochitest/selectable/moz.build
accessible/tests/mochitest/states/Makefile.in
accessible/tests/mochitest/states/a11y.ini
accessible/tests/mochitest/states/moz.build
accessible/tests/mochitest/table/Makefile.in
accessible/tests/mochitest/table/a11y.ini
accessible/tests/mochitest/table/moz.build
accessible/tests/mochitest/text/Makefile.in
accessible/tests/mochitest/text/a11y.ini
accessible/tests/mochitest/text/moz.build
accessible/tests/mochitest/textattrs/Makefile.in
accessible/tests/mochitest/textattrs/a11y.ini
accessible/tests/mochitest/textattrs/moz.build
accessible/tests/mochitest/textcaret/Makefile.in
accessible/tests/mochitest/textcaret/a11y.ini
accessible/tests/mochitest/textcaret/moz.build
accessible/tests/mochitest/textselection/Makefile.in
accessible/tests/mochitest/textselection/a11y.ini
accessible/tests/mochitest/textselection/moz.build
accessible/tests/mochitest/treeupdate/Makefile.in
accessible/tests/mochitest/treeupdate/a11y.ini
accessible/tests/mochitest/treeupdate/moz.build
accessible/tests/mochitest/value/Makefile.in
accessible/tests/mochitest/value/a11y.ini
accessible/tests/mochitest/value/moz.build
--- a/accessible/tests/mochitest/actions/Makefile.in
+++ b/accessible/tests/mochitest/actions/Makefile.in
@@ -1,5 +1,19 @@
 #
 # 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_A11Y_FILES =\
+		test_anchors.html \
+		test_aria.html \
+		test_general.html \
+		test_general.xul \
+		test_controls.html \
+		test_keys_menu.xul \
+		test_keys.html \
+		test_link.html \
+		test_media.html \
+		test_select.html \
+		test_tree.xul \
+		test_treegrid.xul \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/actions/a11y.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[DEFAULT]
-
-[test_anchors.html]
-[test_aria.html]
-[test_controls.html]
-[test_general.html]
-[test_general.xul]
-[test_keys.html]
-[test_keys_menu.xul]
-[test_link.html]
-[test_media.html]
-[test_select.html]
-[test_tree.xul]
-[test_treegrid.xul]
--- a/accessible/tests/mochitest/actions/moz.build
+++ b/accessible/tests/mochitest/actions/moz.build
@@ -1,8 +1,5 @@
 # -*- 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/attributes/Makefile.in
+++ b/accessible/tests/mochitest/attributes/Makefile.in
@@ -1,5 +1,15 @@
 #
 # 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_A11Y_FILES =\
+		test_obj.html \
+		test_obj_css.html \
+		test_obj_css.xul \
+		test_obj_group.html \
+		test_obj_group.xul \
+		test_obj_group_tree.xul \
+		test_tag.html \
+		test_xml-roles.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/attributes/a11y.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[DEFAULT]
-
-[test_obj.html]
-[test_obj_css.html]
-[test_obj_css.xul]
-[test_obj_group.html]
-[test_obj_group.xul]
-[test_obj_group_tree.xul]
-[test_tag.html]
-[test_xml-roles.html]
--- a/accessible/tests/mochitest/attributes/moz.build
+++ b/accessible/tests/mochitest/attributes/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/bounds/Makefile.in
+++ b/accessible/tests/mochitest/bounds/Makefile.in
@@ -1,5 +1,11 @@
 #
 # 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_A11Y_FILES =\
+		test_list.html \
+		test_select.html \
+		test_zoom_text.html \
+		test_zoom.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/bounds/a11y.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-
-[test_list.html]
-[test_select.html]
-[test_zoom.html]
-[test_zoom_text.html]
--- a/accessible/tests/mochitest/bounds/moz.build
+++ b/accessible/tests/mochitest/bounds/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/editabletext/Makefile.in
+++ b/accessible/tests/mochitest/editabletext/Makefile.in
@@ -1,5 +1,10 @@
 #
 # 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_A11Y_FILES =\
+		editabletext.js \
+		test_1.html \
+		test_2.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/editabletext/a11y.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-support-files = editabletext.js
-
-[test_1.html]
-[test_2.html]
--- a/accessible/tests/mochitest/editabletext/moz.build
+++ b/accessible/tests/mochitest/editabletext/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/elm/Makefile.in
+++ b/accessible/tests/mochitest/elm/Makefile.in
@@ -1,5 +1,12 @@
 #
 # 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_A11Y_FILES =\
+		test_figure.html \
+		test_HTMLSpec.html \
+		test_listbox.xul \
+		test_nsApplicationAcc.html \
+		test_plugin.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/elm/a11y.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-
-[test_HTMLSpec.html]
-[test_figure.html]
-[test_listbox.xul]
-[test_nsApplicationAcc.html]
-[test_plugin.html]
--- a/accessible/tests/mochitest/elm/moz.build
+++ b/accessible/tests/mochitest/elm/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/events/Makefile.in
+++ b/accessible/tests/mochitest/events/Makefile.in
@@ -1,11 +1,61 @@
 #
 # 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_A11Y_FILES =\
+		docload_wnd.html \
+		focus.html \
+		scroll.html \
+		test_aria_alert.html \
+		test_aria_menu.html \
+		test_aria_objattr.html \
+		test_aria_statechange.html \
+		test_attrs.html \
+		test_caretmove.html \
+		test_caretmove.xul \
+		test_coalescence.html \
+		test_contextmenu.html \
+		test_docload_aria.html \
+		test_docload.html \
+		test_docload.xul \
+		test_dragndrop.html \
+		test_flush.html \
+		test_focus_aria_activedescendant.html \
+		test_focus_browserui.xul \
+		test_focus_canvas.html \
+		test_focus_contextmenu.xul \
+		test_focus_controls.html \
+		test_focus_dialog.html \
+		test_focus_doc.html \
+		test_focus_general.html \
+		test_focus_general.xul \
+		test_focus_listcontrols.xul \
+		test_focus_menu.xul \
+		test_focus_name.html \
+		test_focus_selects.html \
+		test_focus_tabbox.xul \
+		test_focus_tree.xul \
+		test_fromUserInput.html \
+		test_label.xul \
+		test_menu.xul \
+		test_mutation.html \
+		test_mutation.xhtml \
+		test_scroll.xul \
+		test_selection_aria.html \
+		test_selection.html \
+		test_selection.xul \
+		test_statechange.html \
+		test_text_alg.html \
+		test_text.html \
+		test_textattrchange.html \
+		test_tree.xul \
+		test_valuechange.html \
+		$(NULL)
+
 # Disabled on Linux and Windows due to frequent failures - bug 695019, bug 890795
 ifeq (,$(filter Linux WINNT,$(OS_ARCH)))
 MOCHITEST_A11Y_FILES += \
 		test_focus_autocomplete.xul \
 		$(NULL)
 endif
deleted file mode 100644
--- a/accessible/tests/mochitest/events/a11y.ini
+++ /dev/null
@@ -1,50 +0,0 @@
-[DEFAULT]
-support-files =
-  docload_wnd.html
-  focus.html
-  scroll.html
-
-[test_aria_alert.html]
-[test_aria_menu.html]
-[test_aria_objattr.html]
-[test_aria_statechange.html]
-[test_attrs.html]
-[test_caretmove.html]
-[test_caretmove.xul]
-[test_coalescence.html]
-[test_contextmenu.html]
-[test_docload.html]
-[test_docload.xul]
-[test_docload_aria.html]
-[test_dragndrop.html]
-[test_flush.html]
-[test_focus_aria_activedescendant.html]
-[test_focus_browserui.xul]
-[test_focus_canvas.html]
-[test_focus_contextmenu.xul]
-[test_focus_controls.html]
-[test_focus_dialog.html]
-[test_focus_doc.html]
-[test_focus_general.html]
-[test_focus_general.xul]
-[test_focus_listcontrols.xul]
-[test_focus_menu.xul]
-[test_focus_name.html]
-[test_focus_selects.html]
-[test_focus_tabbox.xul]
-[test_focus_tree.xul]
-[test_fromUserInput.html]
-[test_label.xul]
-[test_menu.xul]
-[test_mutation.html]
-[test_mutation.xhtml]
-[test_scroll.xul]
-[test_selection.html]
-[test_selection.xul]
-[test_selection_aria.html]
-[test_statechange.html]
-[test_text.html]
-[test_text_alg.html]
-[test_textattrchange.html]
-[test_tree.xul]
-[test_valuechange.html]
--- a/accessible/tests/mochitest/events/moz.build
+++ b/accessible/tests/mochitest/events/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/focus/Makefile.in
+++ b/accessible/tests/mochitest/focus/Makefile.in
@@ -1,5 +1,10 @@
 #
 # 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_A11Y_FILES =\
+		test_focusedChild.html \
+		test_takeFocus.html \
+		test_takeFocus.xul \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/focus/a11y.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-
-[test_focusedChild.html]
-[test_takeFocus.html]
-[test_takeFocus.xul]
--- a/accessible/tests/mochitest/focus/moz.build
+++ b/accessible/tests/mochitest/focus/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/hittest/Makefile.in
+++ b/accessible/tests/mochitest/hittest/Makefile.in
@@ -1,5 +1,14 @@
 #
 # 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_A11Y_FILES = \
+		test_browser.html \
+		test_general.html \
+		test_menu.xul \
+		test_zoom_text.html \
+		test_zoom_tree.xul \
+		test_zoom.html \
+		zoom_tree.xul \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/hittest/a11y.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[DEFAULT]
-support-files = zoom_tree.xul
-
-[test_browser.html]
-[test_general.html]
-[test_menu.xul]
-[test_zoom.html]
-[test_zoom_text.html]
-[test_zoom_tree.xul]
--- a/accessible/tests/mochitest/hittest/moz.build
+++ b/accessible/tests/mochitest/hittest/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/hyperlink/Makefile.in
+++ b/accessible/tests/mochitest/hyperlink/Makefile.in
@@ -1,5 +1,10 @@
 #
 # 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_A11Y_FILES =\
+		hyperlink.js \
+		test_general.html \
+		test_general.xul \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/hyperlink/a11y.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-support-files = hyperlink.js
-
-[test_general.html]
-[test_general.xul]
--- a/accessible/tests/mochitest/hyperlink/moz.build
+++ b/accessible/tests/mochitest/hyperlink/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/hypertext/Makefile.in
+++ b/accessible/tests/mochitest/hypertext/Makefile.in
@@ -1,5 +1,9 @@
 #
 # 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_A11Y_FILES = \
+		test_general.html \
+		test_update.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/hypertext/a11y.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-
-[test_general.html]
-[test_update.html]
--- a/accessible/tests/mochitest/hypertext/moz.build
+++ b/accessible/tests/mochitest/hypertext/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/jsat/Makefile.in
+++ b/accessible/tests/mochitest/jsat/Makefile.in
@@ -1,5 +1,16 @@
 #
 # 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_A11Y_FILES =\
+jsatcommon.js \
+output.js \
+test_alive.html \
+test_braille.html \
+test_explicit_names.html \
+test_landmarks.html \
+test_live_regions.html \
+test_tables.html \
+test_utterance_order.html \
+$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/jsat/a11y.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[DEFAULT]
-support-files =
-  jsatcommon.js
-  output.js
-
-[test_alive.html]
-[test_braille.html]
-[test_explicit_names.html]
-[test_landmarks.html]
-[test_live_regions.html]
-[test_tables.html]
-[test_utterance_order.html]
--- a/accessible/tests/mochitest/jsat/moz.build
+++ b/accessible/tests/mochitest/jsat/moz.build
@@ -1,7 +1,4 @@
 # 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/.
-
-A11Y_MANIFESTS += ['a11y.ini']
-
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
\ No newline at end of file
--- a/accessible/tests/mochitest/name/Makefile.in
+++ b/accessible/tests/mochitest/name/Makefile.in
@@ -1,5 +1,19 @@
 #
 # 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_A11Y_FILES =\
+		general.css \
+		general.xbl \
+		markup.js \
+		test_general.html \
+		test_general.xul \
+		test_link.html \
+		test_list.html \
+		test_markup.html \
+		test_svg.html \
+		test_tree.xul \
+		test_browserui.xul \
+		markuprules.xml \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/name/a11y.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-[DEFAULT]
-support-files =
-  general.css
-  general.xbl
-  markup.js
-  markuprules.xml
-
-[test_browserui.xul]
-[test_general.html]
-[test_general.xul]
-[test_link.html]
-[test_list.html]
-[test_markup.html]
-[test_svg.html]
-[test_tree.xul]
--- a/accessible/tests/mochitest/name/moz.build
+++ b/accessible/tests/mochitest/name/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/pivot/Makefile.in
+++ b/accessible/tests/mochitest/pivot/Makefile.in
@@ -1,5 +1,11 @@
 #
 # 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_A11Y_FILES = \
+		doc_virtualcursor.html \
+		doc_virtualcursor_text.html \
+		test_virtualcursor.html \
+		test_virtualcursor_text.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/pivot/a11y.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-support-files =
-  doc_virtualcursor.html
-  doc_virtualcursor_text.html
-
-[test_virtualcursor.html]
-[test_virtualcursor_text.html]
--- a/accessible/tests/mochitest/pivot/moz.build
+++ b/accessible/tests/mochitest/pivot/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/relations/Makefile.in
+++ b/accessible/tests/mochitest/relations/Makefile.in
@@ -1,5 +1,15 @@
 #
 # 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_A11Y_FILES =\
+		test_bindings.xhtml \
+		test_embeds.xul \
+		test_general.html \
+		test_general.xul \
+		test_tabbrowser.xul \
+		test_tree.xul \
+		test_ui_modalprompt.html \
+		test_update.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/relations/a11y.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[DEFAULT]
-
-[test_bindings.xhtml]
-[test_embeds.xul]
-[test_general.html]
-[test_general.xul]
-[test_tabbrowser.xul]
-[test_tree.xul]
-[test_ui_modalprompt.html]
-[test_update.html]
--- a/accessible/tests/mochitest/relations/moz.build
+++ b/accessible/tests/mochitest/relations/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/role/Makefile.in
+++ b/accessible/tests/mochitest/role/Makefile.in
@@ -1,4 +1,11 @@
 # 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_A11Y_FILES =\
+		test_aria.html \
+		test_aria.xul \
+		test_general.html \
+		test_general.xul \
+		test_svg.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/role/a11y.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-
-[test_aria.html]
-[test_aria.xul]
-[test_general.html]
-[test_general.xul]
-[test_svg.html]
--- a/accessible/tests/mochitest/role/moz.build
+++ b/accessible/tests/mochitest/role/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/scroll/Makefile.in
+++ b/accessible/tests/mochitest/scroll/Makefile.in
@@ -1,5 +1,9 @@
 #
 # 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_A11Y_FILES =\
+		test_zoom_text.html \
+		test_zoom.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/scroll/a11y.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-
-[test_zoom.html]
-[test_zoom_text.html]
--- a/accessible/tests/mochitest/scroll/moz.build
+++ b/accessible/tests/mochitest/scroll/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/selectable/Makefile.in
+++ b/accessible/tests/mochitest/selectable/Makefile.in
@@ -1,5 +1,13 @@
 #
 # 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_A11Y_FILES =\
+		test_aria.html \
+		test_listbox.xul \
+		test_menu.xul \
+		test_menulist.xul \
+		test_select.html \
+		test_tree.xul \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/selectable/a11y.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[DEFAULT]
-
-[test_aria.html]
-[test_listbox.xul]
-[test_menu.xul]
-[test_menulist.xul]
-[test_select.html]
-[test_tree.xul]
--- a/accessible/tests/mochitest/selectable/moz.build
+++ b/accessible/tests/mochitest/selectable/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/states/Makefile.in
+++ b/accessible/tests/mochitest/states/Makefile.in
@@ -1,5 +1,34 @@
 #
 # 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_A11Y_FILES =\
+		test_aria.html \
+		test_aria_imgmap.html \
+		test_aria_widgetitems.html \
+		test_buttons.html \
+		test_controls.html \
+		test_controls.xul \
+		test_doc.html \
+		test_doc_busy.html \
+		test_docarticle.html \
+		test_editablebody.html \
+		test_expandable.xul \
+		test_frames.html \
+		test_inputs.html \
+		test_link.html \
+		test_popup.xul \
+		test_selects.html \
+		test_stale.html \
+		test_textbox.xul \
+		test_tabs.xul \
+		test_tree.xul \
+		test_visibility.html \
+		test_visibility.xul \
+		z_frames.html \
+		z_frames_article.html \
+		z_frames_checkbox.html \
+		z_frames_textbox.html \
+		z_frames_update.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/states/a11y.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[DEFAULT]
-support-files =
-  z_frames.html
-  z_frames_article.html
-  z_frames_checkbox.html
-  z_frames_textbox.html
-  z_frames_update.html
-
-[test_aria.html]
-[test_aria_imgmap.html]
-[test_aria_widgetitems.html]
-[test_buttons.html]
-[test_controls.html]
-[test_controls.xul]
-[test_doc.html]
-[test_doc_busy.html]
-[test_docarticle.html]
-[test_editablebody.html]
-[test_expandable.xul]
-[test_frames.html]
-[test_inputs.html]
-[test_link.html]
-[test_popup.xul]
-[test_selects.html]
-[test_stale.html]
-[test_tabs.xul]
-[test_textbox.xul]
-[test_tree.xul]
-[test_visibility.html]
-[test_visibility.xul]
--- a/accessible/tests/mochitest/states/moz.build
+++ b/accessible/tests/mochitest/states/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/table/Makefile.in
+++ b/accessible/tests/mochitest/table/Makefile.in
@@ -1,5 +1,27 @@
 #
 # 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_A11Y_FILES = \
+		test_headers_ariagrid.html \
+		test_headers_listbox.xul \
+		test_headers_table.html \
+		test_headers_tree.xul \
+		test_indexes_ariagrid.html \
+		test_indexes_listbox.xul \
+		test_indexes_table.html \
+		test_indexes_tree.xul \
+		test_layoutguess.html \
+		test_sels_ariagrid.html \
+		test_sels_listbox.xul \
+		test_sels_table.html \
+		test_sels_tree.xul \
+		test_struct_ariagrid.html \
+		test_struct_ariatreegrid.html \
+		test_struct_listbox.xul \
+		test_struct_table.html \
+		test_struct_tree.xul \
+		test_table_1.html \
+		test_table_2.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/table/a11y.ini
+++ /dev/null
@@ -1,22 +0,0 @@
-[DEFAULT]
-
-[test_headers_ariagrid.html]
-[test_headers_listbox.xul]
-[test_headers_table.html]
-[test_headers_tree.xul]
-[test_indexes_ariagrid.html]
-[test_indexes_listbox.xul]
-[test_indexes_table.html]
-[test_indexes_tree.xul]
-[test_layoutguess.html]
-[test_sels_ariagrid.html]
-[test_sels_listbox.xul]
-[test_sels_table.html]
-[test_sels_tree.xul]
-[test_struct_ariagrid.html]
-[test_struct_ariatreegrid.html]
-[test_struct_listbox.xul]
-[test_struct_table.html]
-[test_struct_tree.xul]
-[test_table_1.html]
-[test_table_2.html]
--- a/accessible/tests/mochitest/table/moz.build
+++ b/accessible/tests/mochitest/table/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/text/Makefile.in
+++ b/accessible/tests/mochitest/text/Makefile.in
@@ -1,5 +1,19 @@
 #
 # 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_A11Y_FILES = \
+		doc.html \
+		test_atcaretoffset.html \
+		test_charboundary.html \
+		test_doc.html \
+		test_general.xul \
+		test_gettext.html \
+		test_hypertext.html \
+		test_lineboundary.html \
+		test_passwords.html \
+		test_selection.html \
+		test_wordboundary.html \
+		test_words.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/text/a11y.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[DEFAULT]
-support-files = doc.html
-
-[test_atcaretoffset.html]
-[test_charboundary.html]
-[test_doc.html]
-[test_general.xul]
-[test_gettext.html]
-[test_hypertext.html]
-[test_lineboundary.html]
-[test_passwords.html]
-[test_selection.html]
-[test_wordboundary.html]
-[test_words.html]
--- a/accessible/tests/mochitest/text/moz.build
+++ b/accessible/tests/mochitest/text/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/textattrs/Makefile.in
+++ b/accessible/tests/mochitest/textattrs/Makefile.in
@@ -1,5 +1,9 @@
 #
 # 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_A11Y_FILES =\
+		test_general.html \
+		test_invalid.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/textattrs/a11y.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-
-[test_general.html]
-[test_invalid.html]
--- a/accessible/tests/mochitest/textattrs/moz.build
+++ b/accessible/tests/mochitest/textattrs/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/textcaret/Makefile.in
+++ b/accessible/tests/mochitest/textcaret/Makefile.in
@@ -1,5 +1,9 @@
 #
 # 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_A11Y_FILES = \
+		test_browserui.xul \
+		test_general.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/textcaret/a11y.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-
-[test_browserui.xul]
-[test_general.html]
--- a/accessible/tests/mochitest/textcaret/moz.build
+++ b/accessible/tests/mochitest/textcaret/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/textselection/Makefile.in
+++ b/accessible/tests/mochitest/textselection/Makefile.in
@@ -1,5 +1,9 @@
 #
 # 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_A11Y_FILES = \
+		test_general.html \
+		test_userinput.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/textselection/a11y.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-
-[test_general.html]
-[test_userinput.html]
--- a/accessible/tests/mochitest/textselection/moz.build
+++ b/accessible/tests/mochitest/textselection/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/treeupdate/Makefile.in
+++ b/accessible/tests/mochitest/treeupdate/Makefile.in
@@ -1,5 +1,29 @@
 #
 # 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_A11Y_FILES =\
+		test_ariadialog.html \
+		test_canvas.html \
+		test_colorpicker.xul \
+		test_cssoverflow.html \
+		test_contextmenu.xul \
+		test_deck.xul \
+		test_doc.html \
+		test_gencontent.html \
+		test_hidden.html \
+		test_imagemap.html \
+		test_list_editabledoc.html \
+		test_list.html \
+		test_listbox.xul \
+		test_menu.xul \
+		test_menubutton.xul \
+	test_optgroup.html \
+		test_recreation.html \
+		test_select.html \
+		test_bug852150.xhtml \
+		test_textleaf.html \
+		test_visibility.html \
+		test_whitespace.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/treeupdate/a11y.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[DEFAULT]
-
-[test_ariadialog.html]
-[test_bug852150.xhtml]
-[test_canvas.html]
-[test_colorpicker.xul]
-[test_contextmenu.xul]
-[test_cssoverflow.html]
-[test_deck.xul]
-[test_doc.html]
-[test_gencontent.html]
-[test_hidden.html]
-[test_imagemap.html]
-[test_list.html]
-[test_list_editabledoc.html]
-[test_listbox.xul]
-[test_menu.xul]
-[test_menubutton.xul]
-[test_optgroup.html]
-[test_recreation.html]
-[test_select.html]
-[test_textleaf.html]
-[test_visibility.html]
-[test_whitespace.html]
--- a/accessible/tests/mochitest/treeupdate/moz.build
+++ b/accessible/tests/mochitest/treeupdate/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-
--- a/accessible/tests/mochitest/value/Makefile.in
+++ b/accessible/tests/mochitest/value/Makefile.in
@@ -1,5 +1,11 @@
 #
 # 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_A11Y_FILES =\
+		test_general.html \
+		test_progress.html \
+		test_progress.xul \
+		test_range.html \
+		$(NULL)
deleted file mode 100644
--- a/accessible/tests/mochitest/value/a11y.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-
-[test_general.html]
-[test_progress.html]
-[test_progress.xul]
-[test_range.html]
--- a/accessible/tests/mochitest/value/moz.build
+++ b/accessible/tests/mochitest/value/moz.build
@@ -1,8 +1,6 @@
 # -*- 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/.
 
-A11Y_MANIFESTS += ['a11y.ini']
-