Bug 1103651 - Merge content/test/unit/ into dom/base/test/unit/. r=mrbkap
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Wed, 17 Jun 2015 06:38:22 -0700
changeset 280117 cd97bdca42133de713aabd337be4b39c839e955f
parent 280116 1e17258d3213ac375ac59ce8d82a15ce9df4242e
child 280118 5089bfbf5787a95193ccde8e222bdeb406034274
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap
bugs1103651
milestone41.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 1103651 - Merge content/test/unit/ into dom/base/test/unit/. r=mrbkap
content/moz.build
content/test/unit/empty_document.xml
content/test/unit/head_content.js
content/test/unit/isequalnode_data.xml
content/test/unit/nodelist_data_1.xml
content/test/unit/nodelist_data_2.xul
content/test/unit/test_delete_range.xml
content/test/unit/test_isequalnode.js
content/test/unit/test_nodelist.js
content/test/unit/test_normalize.js
content/test/unit/test_range.js
content/test/unit/test_treewalker.js
content/test/unit/test_xml_parser.js
content/test/unit/test_xml_serializer.js
content/test/unit/xpcshell.ini
dom/base/test/unit/empty_document.xml
dom/base/test/unit/head_xml.js
dom/base/test/unit/isequalnode_data.xml
dom/base/test/unit/nodelist_data_1.xml
dom/base/test/unit/nodelist_data_2.xul
dom/base/test/unit/test_delete_range.xml
dom/base/test/unit/test_isequalnode.js
dom/base/test/unit/test_nodelist.js
dom/base/test/unit/test_normalize.js
dom/base/test/unit/test_range.js
dom/base/test/unit/test_treewalker.js
dom/base/test/unit/test_xml_parser.js
dom/base/test/unit/test_xml_serializer.js
dom/base/test/unit/xpcshell.ini
toolkit/toolkit.mozbuild
deleted file mode 100644
--- a/content/moz.build
+++ /dev/null
@@ -1,7 +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/.
-
-XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
deleted file mode 100644
--- a/content/test/unit/xpcshell.ini
+++ /dev/null
@@ -1,18 +0,0 @@
-[DEFAULT]
-head = head_content.js
-tail =
-skip-if = toolkit == 'gonk'
-support-files =
-  empty_document.xml
-  isequalnode_data.xml
-  nodelist_data_1.xml
-  nodelist_data_2.xul
-  test_delete_range.xml
-
-[test_isequalnode.js]
-[test_nodelist.js]
-[test_normalize.js]
-[test_range.js]
-[test_treewalker.js]
-[test_xml_parser.js]
-[test_xml_serializer.js]
rename from content/test/unit/empty_document.xml
rename to dom/base/test/unit/empty_document.xml
rename from content/test/unit/head_content.js
rename to dom/base/test/unit/head_xml.js
rename from content/test/unit/isequalnode_data.xml
rename to dom/base/test/unit/isequalnode_data.xml
rename from content/test/unit/nodelist_data_1.xml
rename to dom/base/test/unit/nodelist_data_1.xml
rename from content/test/unit/nodelist_data_2.xul
rename to dom/base/test/unit/nodelist_data_2.xul
rename from content/test/unit/test_delete_range.xml
rename to dom/base/test/unit/test_delete_range.xml
rename from content/test/unit/test_isequalnode.js
rename to dom/base/test/unit/test_isequalnode.js
rename from content/test/unit/test_nodelist.js
rename to dom/base/test/unit/test_nodelist.js
rename from content/test/unit/test_normalize.js
rename to dom/base/test/unit/test_normalize.js
rename from content/test/unit/test_range.js
rename to dom/base/test/unit/test_range.js
rename from content/test/unit/test_treewalker.js
rename to dom/base/test/unit/test_treewalker.js
rename from content/test/unit/test_xml_parser.js
rename to dom/base/test/unit/test_xml_parser.js
rename from content/test/unit/test_xml_serializer.js
rename to dom/base/test/unit/test_xml_serializer.js
--- a/dom/base/test/unit/xpcshell.ini
+++ b/dom/base/test/unit/xpcshell.ini
@@ -15,19 +15,38 @@ support-files =
   3_result_2.xml
   4_original.xml
   4_result_1.xml
   4_result_2.xml
   4_result_3.xml
   4_result_4.xml
   4_result_5.xml
   4_result_6.xml
+  empty_document.xml
+  isequalnode_data.xml
+  nodelist_data_1.xml
+  nodelist_data_2.xul
+  test_delete_range.xml
 
 [test_bug553888.js]
 [test_bug737966.js]
 [test_error_codes.js]
 run-sequentially = Hardcoded 4444 port.
 # Bug 1018414: hardcoded localhost doesn't work properly on some OS X installs
 skip-if = os == 'mac'
+[test_isequalnode.js]
+head = head_xml.js
+[test_nodelist.js]
+head = head_xml.js
+[test_normalize.js]
+head = head_xml.js
+[test_range.js]
+head = head_xml.js
 [test_thirdpartyutil.js]
+[test_treewalker.js]
+head = head_xml.js
 [test_xhr_document.js]
 [test_xhr_standalone.js]
+[test_xml_parser.js]
+head = head_xml.js
+[test_xml_serializer.js]
+head = head_xml.js
 [test_xmlserializer.js]
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -89,17 +89,16 @@ DIRS += [
     '/uriloader',
     '/caps',
     '/parser',
     '/gfx',
     '/image',
     '/dom',
     '/view',
     '/widget',
-    '/content',
     '/editor',
     '/layout',
     '/docshell',
     '/embedding',
     '/xpfe/appshell'
 ]
 
 # This needs to be built after the gfx/ directory