Bug 969021 - Part 1: Consolidate moz.build data into parent moz.build…

… files; r=ted Many moz.build files define things that could be defined in parent moz.build files. Keeping the number of moz.build files low helps with build times due to less I/O and fewer directories traversed. This patch eliminates a lot of moz.build files by moving their content into parent moz.build files.
Brli · Feb 6, 2014 · 8b16b9e · 8b16b9e
1 parent 213c66b
commit 8b16b9e
Show file tree

Hide file tree

Showing 93 changed files with 97 additions and 495 deletions.
diff --git a/netwerk/test/browser/moz.build b/netwerk/test/browser/moz.build
diff --git a/netwerk/test/mochitests/moz.build b/netwerk/test/mochitests/moz.build
diff --git a/netwerk/test/moz.build b/netwerk/test/moz.build
@@ -4,10 +4,12 @@
 # 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_TOOL_DIRS += ['httpserver', 'browser', 'mochitests']
+TEST_TOOL_DIRS += ['httpserver']
 
 FAIL_ON_WARNINGS = True
 
+BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
+MOCHITEST_MANIFESTS += ['mochitests/mochitest.ini']
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 # FIXME/bug 575918: out-of-process xpcshell is broken on OS X

diff --git a/toolkit/components/aboutmemory/moz.build b/toolkit/components/aboutmemory/moz.build
@@ -4,6 +4,6 @@
 # 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 += ['tests']
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
 
-JAR_MANIFESTS += ['jar.mn']
+JAR_MANIFESTS += ['jar.mn']
diff --git a/toolkit/components/aboutmemory/tests/moz.build b/toolkit/components/aboutmemory/tests/moz.build
diff --git a/toolkit/components/alerts/moz.build b/toolkit/components/alerts/moz.build
@@ -4,7 +4,7 @@
 # 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']
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
 
 XPIDL_SOURCES += [
     'nsIAlertsService.idl',
@@ -21,4 +21,4 @@ include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'toolkitcomps'
 
-JAR_MANIFESTS += ['jar.mn']
+JAR_MANIFESTS += ['jar.mn']
diff --git a/toolkit/components/alerts/test/moz.build b/toolkit/components/alerts/test/moz.build
diff --git a/toolkit/components/autocomplete/moz.build b/toolkit/components/autocomplete/moz.build
@@ -4,7 +4,7 @@
 # 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 += ['tests']
+XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 XPIDL_SOURCES += [
     'nsIAutoCompleteController.idl',

diff --git a/toolkit/components/autocomplete/tests/moz.build b/toolkit/components/autocomplete/tests/moz.build
diff --git a/toolkit/components/captivedetect/moz.build b/toolkit/components/captivedetect/moz.build
@@ -4,7 +4,7 @@
 # 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']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
 
 XPIDL_SOURCES += [
     'nsICaptivePortalDetector.idl',

diff --git a/toolkit/components/captivedetect/test/moz.build b/toolkit/components/captivedetect/test/moz.build
diff --git a/toolkit/components/commandlines/moz.build b/toolkit/components/commandlines/moz.build
@@ -4,7 +4,12 @@
 # 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']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    XPCSHELL_TESTS_MANIFESTS += ['test/unit_win/xpcshell.ini']
+elif CONFIG['OS_ARCH'] != 'Darwin':
+    XPCSHELL_TESTS_MANIFESTS += ['test/unit_unix/xpcshell.ini']
 
 XPIDL_SOURCES += [
     'nsICommandLine.idl',

diff --git a/toolkit/components/commandlines/test/moz.build b/toolkit/components/commandlines/test/moz.build
diff --git a/toolkit/components/console/moz.build b/toolkit/components/console/moz.build
@@ -4,11 +4,11 @@
 # 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 += ['tests']
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini']
 
 EXTRA_COMPONENTS += [
     'jsconsole-clhandler.js',
     'jsconsole-clhandler.manifest',
 ]
 
-JAR_MANIFESTS += ['jar.mn']
+JAR_MANIFESTS += ['jar.mn']
diff --git a/toolkit/components/console/tests/moz.build b/toolkit/components/console/tests/moz.build
diff --git a/toolkit/components/contentprefs/moz.build b/toolkit/components/contentprefs/moz.build
@@ -4,7 +4,10 @@
 # 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 += ['tests']
+XPCSHELL_TESTS_MANIFESTS += [
+    'tests/unit/xpcshell.ini',
+    'tests/unit_cps2/xpcshell.ini',
+]
 
 EXTRA_COMPONENTS += [
     'nsContentPrefService.js',

diff --git a/toolkit/components/contentprefs/tests/moz.build b/toolkit/components/contentprefs/tests/moz.build
diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
@@ -4,7 +4,11 @@
 # 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']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
+
+if not CONFIG['MOZ_JSDOWNLOADS']:
+    TEST_DIRS += ['test/browser']
+    XPCSHELL_TESTS_MANIFESTS += ['test/schema_migration/xpcshell.ini']
 
 XPIDL_SOURCES += [
     'nsIApplicationReputation.idl',

diff --git a/toolkit/components/downloads/test/moz.build b/toolkit/components/downloads/test/moz.build
diff --git a/toolkit/components/feeds/moz.build b/toolkit/components/feeds/moz.build
@@ -4,7 +4,7 @@
 # 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']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
 
 XPIDL_SOURCES += [
     'nsIFeed.idl',

diff --git a/toolkit/components/feeds/test/moz.build b/toolkit/components/feeds/test/moz.build
diff --git a/toolkit/components/filepicker/moz.build b/toolkit/components/filepicker/moz.build
@@ -19,9 +19,9 @@ if CONFIG['MOZ_XUL'] and \
         EXTRA_PP_COMPONENTS += [
             'nsFilePicker.manifest',
         ]
-        DIRS += [
-            'test',
+        XPCSHELL_TESTS_MANIFESTS += [
+            'test/unit/xpcshell.ini',
         ]
         FINAL_LIBRARY = 'xul'
 
-JAR_MANIFESTS += ['jar.mn']
+JAR_MANIFESTS += ['jar.mn']
diff --git a/toolkit/components/filepicker/test/moz.build b/toolkit/components/filepicker/test/moz.build
diff --git a/toolkit/components/jsdownloads/moz.build b/toolkit/components/jsdownloads/moz.build
@@ -5,5 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['public', 'src']
-TEST_DIRS += ['test']
 
+TEST_DIRS += ['test/data']
+
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
diff --git a/toolkit/components/jsdownloads/test/moz.build b/toolkit/components/jsdownloads/test/moz.build
diff --git a/toolkit/components/mediasniffer/moz.build b/toolkit/components/mediasniffer/moz.build
@@ -4,7 +4,7 @@
 # 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']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
 
 EXPORTS += [
     'nsMediaSniffer.h',

diff --git a/toolkit/components/mediasniffer/test/moz.build b/toolkit/components/mediasniffer/test/moz.build
diff --git a/toolkit/components/microformats/moz.build b/toolkit/components/microformats/moz.build
@@ -4,7 +4,7 @@
 # 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 += ['tests']
+MOCHITEST_MANIFESTS += ['tests/mochitest.ini']
 
 EXTRA_JS_MODULES += [
     'Microformats.js',

diff --git a/toolkit/components/microformats/tests/moz.build b/toolkit/components/microformats/tests/moz.build
diff --git a/toolkit/components/osfile/moz.build b/toolkit/components/osfile/moz.build
@@ -8,7 +8,8 @@ DIRS += [
     'modules',
 ]
 
-TEST_DIRS += ['tests']
+MOCHITEST_CHROME_MANIFESTS += ['tests/mochi/chrome.ini']
+XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
 
 EXTRA_PP_JS_MODULES += [
     'osfile.jsm',

diff --git a/toolkit/components/osfile/tests/mochi/moz.build b/toolkit/components/osfile/tests/mochi/moz.build
diff --git a/toolkit/components/osfile/tests/moz.build b/toolkit/components/osfile/tests/moz.build
diff --git a/toolkit/components/passwordmgr/moz.build b/toolkit/components/passwordmgr/moz.build
@@ -4,7 +4,10 @@
 # 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']
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
+BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
 
 XPIDL_SOURCES += [
     'nsILoginInfo.idl',
@@ -34,4 +37,4 @@ EXTRA_JS_MODULES += [
     'LoginManagerContent.jsm',
 ]
 
-JAR_MANIFESTS += ['jar.mn']
+JAR_MANIFESTS += ['jar.mn']
diff --git a/toolkit/components/passwordmgr/test/moz.build b/toolkit/components/passwordmgr/test/moz.build
diff --git a/toolkit/components/prompts/moz.build b/toolkit/components/prompts/moz.build
@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['src']
-TEST_DIRS += ['test']
 
-JAR_MANIFESTS += ['jar.mn']
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+
+JAR_MANIFESTS += ['jar.mn']
diff --git a/toolkit/components/prompts/test/moz.build b/toolkit/components/prompts/test/moz.build