From 057727599f7ece7fcb2e271d3dfbf3a2ea849f77 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Thu, 28 Nov 2013 15:07:53 +0100
Subject: [PATCH] Bug 939518 - Part a: move support files for dom-level1-core
 into manifests; r=mrbkap

---
 .../dom-level1-core/files/Makefile.in         | 26 -------------------
 .../mochitest/dom-level1-core/files/moz.build |  6 -----
 .../mochitest/dom-level1-core/mochitest.ini   | 23 ++++++++++++++--
 dom/tests/mochitest/dom-level1-core/moz.build | 10 -------
 dom/tests/mochitest/moz.build                 |  4 ++-
 5 files changed, 24 insertions(+), 45 deletions(-)
 delete mode 100644 dom/tests/mochitest/dom-level1-core/files/Makefile.in
 delete mode 100644 dom/tests/mochitest/dom-level1-core/files/moz.build
 delete mode 100644 dom/tests/mochitest/dom-level1-core/moz.build

diff --git a/dom/tests/mochitest/dom-level1-core/files/Makefile.in b/dom/tests/mochitest/dom-level1-core/files/Makefile.in
deleted file mode 100644
index e1dbea34407..00000000000
--- a/dom/tests/mochitest/dom-level1-core/files/Makefile.in
+++ /dev/null
@@ -1,26 +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	= \
-		hc_nodtdstaff.html \
-		hc_nodtdstaff.xhtml \
-		hc_staff.html \
-		hc_staff.xhtml \
-		staff.dtd \
-		staff.xml \
-		svgunit.js \
-		xhtml-special.ent \
-		xhtml1-frameset.dtd \
-		xhtml1-transitional.dtd \
-		hc_nodtdstaff.svg \
-		hc_nodtdstaff.xml \
-		hc_staff.svg \
-		hc_staff.xml \
-		staff.svg \
-		svgtest.js \
-		xhtml-lat1.ent \
-		xhtml-symbol.ent \
-		xhtml1-strict.dtd \
-		$(NULL)
diff --git a/dom/tests/mochitest/dom-level1-core/files/moz.build b/dom/tests/mochitest/dom-level1-core/files/moz.build
deleted file mode 100644
index 895d11993cf..00000000000
--- a/dom/tests/mochitest/dom-level1-core/files/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/.
-
diff --git a/dom/tests/mochitest/dom-level1-core/mochitest.ini b/dom/tests/mochitest/dom-level1-core/mochitest.ini
index 52e8a1f3100..4e81a5aaefa 100644
--- a/dom/tests/mochitest/dom-level1-core/mochitest.ini
+++ b/dom/tests/mochitest/dom-level1-core/mochitest.ini
@@ -1,10 +1,29 @@
 [DEFAULT]
+# Timeouts on OS X (bug 921635)
+skip-if = os == "mac"
 support-files =
   DOMTestCase.js
   activity-home.css
   exclusions.js
-# Timeouts on OS X (bug 921635)
-skip-if = os == "mac"
+  files/hc_nodtdstaff.html
+  files/hc_nodtdstaff.xhtml
+  files/hc_staff.html
+  files/hc_staff.xhtml
+  files/staff.dtd
+  files/staff.xml
+  files/svgunit.js
+  files/xhtml-special.ent
+  files/xhtml1-frameset.dtd
+  files/xhtml1-transitional.dtd
+  files/hc_nodtdstaff.svg
+  files/hc_nodtdstaff.xml
+  files/hc_staff.svg
+  files/hc_staff.xml
+  files/staff.svg
+  files/svgtest.js
+  files/xhtml-lat1.ent
+  files/xhtml-symbol.ent
+  files/xhtml1-strict.dtd
 
 [test_PIsetdatanomodificationallowederrEE.html]
 [test_attrcreatedocumentfragment.html]
diff --git a/dom/tests/mochitest/dom-level1-core/moz.build b/dom/tests/mochitest/dom-level1-core/moz.build
deleted file mode 100644
index 074b97a1122..00000000000
--- a/dom/tests/mochitest/dom-level1-core/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']
-
diff --git a/dom/tests/mochitest/moz.build b/dom/tests/mochitest/moz.build
index 3dc79b5b115..b3d27bf2bc6 100644
--- a/dom/tests/mochitest/moz.build
+++ b/dom/tests/mochitest/moz.build
@@ -6,7 +6,6 @@
 
 DIRS += [
     'dom-level0',
-    'dom-level1-core',
     'dom-level2-core',
     'dom-level2-html',
     'ajax',
@@ -29,3 +28,6 @@ DIRS += [
 if CONFIG['MOZ_GAMEPAD']:
    DIRS += ['gamepad']
 
+MOCHITEST_MANIFESTS += [
+    'dom-level1-core/mochitest.ini',
+]