Bug 939518 - Part c: move support files for dom-level2-html into manifests; r=mrbkap
authorMs2ger <ms2ger@gmail.com>
Thu, 28 Nov 2013 15:07:53 +0100
changeset 157984 2c3e39ca0950cf029e14f52cd0695d0070306db5
parent 157983 b32f13014928be2eebbd39404152d0e763e62585
child 157985 995adfd14ecd9191e2578d323b01a678430aadd8
push id25730
push userMs2ger@gmail.com
push dateFri, 29 Nov 2013 07:40:20 +0000
treeherdermozilla-central@733f30f7093b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap
bugs939518
milestone28.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
Bug 939518 - Part c: move support files for dom-level2-html into manifests; r=mrbkap
dom/tests/mochitest/dom-level2-html/files/Makefile.in
dom/tests/mochitest/dom-level2-html/files/applets/org/w3c/domts/Makefile.in
dom/tests/mochitest/dom-level2-html/files/applets/org/w3c/domts/moz.build
dom/tests/mochitest/dom-level2-html/files/moz.build
dom/tests/mochitest/dom-level2-html/mochitest.ini
dom/tests/mochitest/dom-level2-html/moz.build
dom/tests/mochitest/moz.build
deleted file mode 100644
--- a/dom/tests/mochitest/dom-level2-html/files/Makefile.in
+++ /dev/null
@@ -1,212 +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/.
-
-MOCHITEST_FILES	= \
-		anchor.html \
-		anchor.xhtml \
-		anchor.xml \
-		anchor2.html \
-		anchor2.xhtml \
-		anchor2.xml \
-		applet.html \
-		applet.xhtml \
-		applet.xml \
-		applet2.class \
-		applet2.html \
-		applet2.xhtml \
-		applet2.xml \
-		area.html \
-		area.xhtml \
-		area.xml \
-		area2.html \
-		area2.xhtml \
-		area2.xml \
-		base.html \
-		base.xhtml \
-		base.xml \
-		base2.html \
-		base2.xhtml \
-		base2.xml \
-		body.html \
-		body.xhtml \
-		body.xml \
-		br.html \
-		br.xhtml \
-		br.xml \
-		button.html \
-		button.xhtml \
-		button.xml \
-		collection.html \
-		collection.xhtml \
-		collection.xml \
-		directory.html \
-		directory.xhtml \
-		directory.xml \
-		div.html \
-		div.xhtml \
-		div.xml \
-		dl.html \
-		dl.xhtml \
-		dl.xml \
-		document.html \
-		document-with-applet.html \
-		document.xhtml \
-		document.xml \
-		element.html \
-		element.xhtml \
-		element.xml \
-		fieldset.html \
-		fieldset.xhtml \
-		fieldset.xml \
-		font.html \
-		font.xhtml \
-		font.xml \
-		form.html \
-		form.xhtml \
-		form.xml \
-		form2.html \
-		form2.xhtml \
-		form2.xml \
-		form3.html \
-		form3.xhtml \
-		form3.xml \
-		frame.html \
-		frame.xhtml \
-		frame.xml \
-		frame2.html \
-		frame2.xhtml \
-		frame2.xml \
-		frameset.html \
-		frameset.xhtml \
-		frameset.xml \
-		heading.html \
-		heading.xhtml \
-		heading.xml \
-		hr.html \
-		hr.xhtml \
-		hr.xml \
-                html.html \
-                html.xhtml \
-                html.xml \
-		iframe.html \
-		iframe.xhtml \
-		iframe.xml \
-		iframe2.html \
-		iframe2.xhtml \
-		iframe2.xml \
-		img.html \
-		img.xhtml \
-		img.xml \
-		index.html \
-		input.html \
-		input.xhtml \
-		input.xml \
-		isindex.html \
-		isindex.xhtml \
-		isindex.xml \
-		label.html \
-		label.xhtml \
-		label.xml \
-		legend.html \
-		legend.xhtml \
-		legend.xml \
-		li.html \
-		li.xhtml \
-		li.xml \
-		link.html \
-		link.xhtml \
-		link.xml \
-		link2.html \
-		link2.xhtml \
-		link2.xml \
-		map.html \
-		map.xhtml \
-		map.xml \
-		menu.html \
-		menu.xhtml \
-		menu.xml \
-		meta.html \
-		meta.xhtml \
-		meta.xml \
-		mod.html \
-		mod.xhtml \
-		mod.xml \
-		object.html \
-		object.xhtml \
-		object.xml \
-		object2.html \
-		object2.xhtml \
-		object2.xml \
-		olist.html \
-		olist.xhtml \
-		olist.xml \
-		optgroup.html \
-		optgroup.xhtml \
-		optgroup.xml \
-		option.html \
-		option.xhtml \
-		option.xml \
-		optionscollection.html \
-		optionscollection.xhtml \
-		optionscollection.xml \
-		paragraph.html \
-		paragraph.xhtml \
-		paragraph.xml \
-		param.html \
-		param.xhtml \
-		param.xml \
-		pre.html \
-		pre.xhtml \
-		pre.xml \
-		quote.html \
-		quote.xhtml \
-		quote.xml \
-		right.png \
-		script.html \
-		script.xhtml \
-		script.xml \
-		select.html \
-		select.xhtml \
-		select.xml \
-		style.html \
-		style.xhtml \
-		style.xml \
-		table.html \
-		table.xhtml \
-		table.xml \
-		table1.html \
-		table1.xhtml \
-		table1.xml \
-		tablecaption.html \
-		tablecaption.xhtml \
-		tablecaption.xml \
-		tablecell.html \
-		tablecell.xhtml \
-		tablecell.xml \
-		tablecol.html \
-		tablecol.xhtml \
-		tablecol.xml \
-		tablerow.html \
-		tablerow.xhtml \
-		tablerow.xml \
-		tablesection.html \
-		tablesection.xhtml \
-		tablesection.xml \
-		textarea.html \
-		textarea.xhtml \
-		textarea.xml \
-		title.html \
-		title.xhtml \
-		title.xml \
-		ulist.html \
-		ulist.xhtml \
-		ulist.xml \
-		w3c_main.png \
-		xhtml-lat1.ent \
-		xhtml-special.ent \
-		xhtml-symbol.ent \
-		xhtml1-frameset.dtd \
-		xhtml1-strict.dtd \
-		xhtml1-transitional.dtd \
-		$(NULL)
deleted file mode 100644
--- a/dom/tests/mochitest/dom-level2-html/files/applets/org/w3c/domts/Makefile.in
+++ /dev/null
@@ -1,7 +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/.
-
-MOCHITEST_FILES := \
-  DOMTSApplet.class \
-  $(NULL)
deleted file mode 100644
--- a/dom/tests/mochitest/dom-level2-html/files/applets/org/w3c/domts/moz.build
+++ /dev/null
@@ -1,6 +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/.
-
deleted file mode 100644
--- a/dom/tests/mochitest/dom-level2-html/files/moz.build
+++ /dev/null
@@ -1,9 +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/.
-
-DIRS += [
-    'applets/org/w3c/domts',
-]
--- a/dom/tests/mochitest/dom-level2-html/mochitest.ini
+++ b/dom/tests/mochitest/dom-level2-html/mochitest.ini
@@ -1,12 +1,220 @@
 [DEFAULT]
-support-files = DOMTestCase.js
 # Timeouts on OS X (bug 921635)
 skip-if = os == "mac"
+support-files =
+  DOMTestCase.js
+  files/anchor.html
+  files/anchor.xhtml
+  files/anchor.xml
+  files/anchor2.html
+  files/anchor2.xhtml
+  files/anchor2.xml
+  files/applet.html
+  files/applet.xhtml
+  files/applet.xml
+  files/applet2.class
+  files/applet2.html
+  files/applet2.xhtml
+  files/applet2.xml
+  files/area.html
+  files/area.xhtml
+  files/area.xml
+  files/area2.html
+  files/area2.xhtml
+  files/area2.xml
+  files/base.html
+  files/base.xhtml
+  files/base.xml
+  files/base2.html
+  files/base2.xhtml
+  files/base2.xml
+  files/body.html
+  files/body.xhtml
+  files/body.xml
+  files/br.html
+  files/br.xhtml
+  files/br.xml
+  files/button.html
+  files/button.xhtml
+  files/button.xml
+  files/collection.html
+  files/collection.xhtml
+  files/collection.xml
+  files/directory.html
+  files/directory.xhtml
+  files/directory.xml
+  files/div.html
+  files/div.xhtml
+  files/div.xml
+  files/dl.html
+  files/dl.xhtml
+  files/dl.xml
+  files/document.html
+  files/document-with-applet.html
+  files/document.xhtml
+  files/document.xml
+  files/element.html
+  files/element.xhtml
+  files/element.xml
+  files/fieldset.html
+  files/fieldset.xhtml
+  files/fieldset.xml
+  files/font.html
+  files/font.xhtml
+  files/font.xml
+  files/form.html
+  files/form.xhtml
+  files/form.xml
+  files/form2.html
+  files/form2.xhtml
+  files/form2.xml
+  files/form3.html
+  files/form3.xhtml
+  files/form3.xml
+  files/frame.html
+  files/frame.xhtml
+  files/frame.xml
+  files/frame2.html
+  files/frame2.xhtml
+  files/frame2.xml
+  files/frameset.html
+  files/frameset.xhtml
+  files/frameset.xml
+  files/heading.html
+  files/heading.xhtml
+  files/heading.xml
+  files/hr.html
+  files/hr.xhtml
+  files/hr.xml
+  files/html.html
+  files/html.xhtml
+  files/html.xml
+  files/iframe.html
+  files/iframe.xhtml
+  files/iframe.xml
+  files/iframe2.html
+  files/iframe2.xhtml
+  files/iframe2.xml
+  files/img.html
+  files/img.xhtml
+  files/img.xml
+  files/index.html
+  files/input.html
+  files/input.xhtml
+  files/input.xml
+  files/isindex.html
+  files/isindex.xhtml
+  files/isindex.xml
+  files/label.html
+  files/label.xhtml
+  files/label.xml
+  files/legend.html
+  files/legend.xhtml
+  files/legend.xml
+  files/li.html
+  files/li.xhtml
+  files/li.xml
+  files/link.html
+  files/link.xhtml
+  files/link.xml
+  files/link2.html
+  files/link2.xhtml
+  files/link2.xml
+  files/map.html
+  files/map.xhtml
+  files/map.xml
+  files/menu.html
+  files/menu.xhtml
+  files/menu.xml
+  files/meta.html
+  files/meta.xhtml
+  files/meta.xml
+  files/mod.html
+  files/mod.xhtml
+  files/mod.xml
+  files/object.html
+  files/object.xhtml
+  files/object.xml
+  files/object2.html
+  files/object2.xhtml
+  files/object2.xml
+  files/olist.html
+  files/olist.xhtml
+  files/olist.xml
+  files/optgroup.html
+  files/optgroup.xhtml
+  files/optgroup.xml
+  files/option.html
+  files/option.xhtml
+  files/option.xml
+  files/optionscollection.html
+  files/optionscollection.xhtml
+  files/optionscollection.xml
+  files/paragraph.html
+  files/paragraph.xhtml
+  files/paragraph.xml
+  files/param.html
+  files/param.xhtml
+  files/param.xml
+  files/pre.html
+  files/pre.xhtml
+  files/pre.xml
+  files/quote.html
+  files/quote.xhtml
+  files/quote.xml
+  files/right.png
+  files/script.html
+  files/script.xhtml
+  files/script.xml
+  files/select.html
+  files/select.xhtml
+  files/select.xml
+  files/style.html
+  files/style.xhtml
+  files/style.xml
+  files/table.html
+  files/table.xhtml
+  files/table.xml
+  files/table1.html
+  files/table1.xhtml
+  files/table1.xml
+  files/tablecaption.html
+  files/tablecaption.xhtml
+  files/tablecaption.xml
+  files/tablecell.html
+  files/tablecell.xhtml
+  files/tablecell.xml
+  files/tablecol.html
+  files/tablecol.xhtml
+  files/tablecol.xml
+  files/tablerow.html
+  files/tablerow.xhtml
+  files/tablerow.xml
+  files/tablesection.html
+  files/tablesection.xhtml
+  files/tablesection.xml
+  files/textarea.html
+  files/textarea.xhtml
+  files/textarea.xml
+  files/title.html
+  files/title.xhtml
+  files/title.xml
+  files/ulist.html
+  files/ulist.xhtml
+  files/ulist.xml
+  files/w3c_main.png
+  files/xhtml-lat1.ent
+  files/xhtml-special.ent
+  files/xhtml-symbol.ent
+  files/xhtml1-frameset.dtd
+  files/xhtml1-strict.dtd
+  files/xhtml1-transitional.dtd
+  files/applets/org/w3c/domts/DOMTSApplet.class
 
 [test_HTMLAnchorElement01.html]
 [test_HTMLAnchorElement02.html]
 [test_HTMLAnchorElement03.html]
 [test_HTMLAnchorElement04.html]
 [test_HTMLAnchorElement05.html]
 [test_HTMLAnchorElement06.html]
 [test_HTMLAnchorElement07.html]
deleted file mode 100644
--- a/dom/tests/mochitest/dom-level2-html/moz.build
+++ /dev/null
@@ -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/.
-
-TEST_DIRS += ['files']
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
--- a/dom/tests/mochitest/moz.build
+++ b/dom/tests/mochitest/moz.build
@@ -1,17 +1,16 @@
 # -*- 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/.
 
 DIRS += [
     'dom-level0',
-    'dom-level2-html',
     'ajax',
     'bugs',
     'chrome',
     'crypto',
     'general',
     'whatwg',
     'geolocation',
     'localstorage',
@@ -25,9 +24,10 @@ DIRS += [
 ]
 
 if CONFIG['MOZ_GAMEPAD']:
    DIRS += ['gamepad']
 
 MOCHITEST_MANIFESTS += [
     'dom-level1-core/mochitest.ini',
     'dom-level2-core/mochitest.ini',
+    'dom-level2-html/mochitest.ini',
 ]