Bug 1044445 - Collapse test-only moz.build files under content/media/ into ancestor moz.build files. r=glandium

content/media/mediasource/moz.build

@@ -3,9 +3,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/.
 
-DIRS += [
-    'test'
-]
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
 
 EXPORTS += [
     'AsyncEventRunner.h',

content/media/mediasource/test/moz.build

@@ -1,7 +0,0 @@
-# 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/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-

content/media/moz.build

@@ -55,10 +55,12 @@ if CONFIG['MOZ_EME']:
     DIRS += ['eme']
 
 TEST_DIRS += [
-    'test',
     'gtest',
 ]
 
+MOCHITEST_MANIFESTS += ['test/mochitest.ini']
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
+
 EXPORTS += [
     'AbstractMediaDecoder.h',
     'AudioChannelFormat.h',

content/media/test/moz.build

@@ -1,8 +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/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']

content/media/webaudio/moz.build

@@ -4,10 +4,19 @@
 # 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 += ['blink', 'test']
+DIRS += ['blink']
 
 TEST_DIRS += ['compiledtest']
 
+MOCHITEST_MANIFESTS += [
+    'test/blink/mochitest.ini',
+    'test/mochitest.ini',
+]
+
+MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
+
+BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
+
 EXPORTS += [
     'AudioContext.h',
     'AudioParamTimeline.h',

content/media/webaudio/test/moz.build

@@ -1,18 +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/.
-
-MOCHITEST_MANIFESTS += [
-    'blink/mochitest.ini',
-    'mochitest.ini',
-]
-
-MOCHITEST_CHROME_MANIFESTS += [
-    'chrome.ini'
-]
-
-BROWSER_CHROME_MANIFESTS += [
-    'browser.ini'
-]

content/media/webspeech/recognition/moz.build

@@ -3,14 +3,14 @@
 # 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_MANIFESTS += ['test/mochitest.ini']
+
 XPIDL_MODULE = 'dom_webspeechrecognition'
 
 XPIDL_SOURCES = [
   'nsISpeechRecognitionService.idl'
 ]
 
-TEST_DIRS += ['test']
-
 EXPORTS.mozilla.dom += [
     'SpeechGrammar.h',
     'SpeechGrammarList.h',

content/media/webspeech/recognition/test/moz.build

@@ -1,7 +0,0 @@
-# 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/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-

content/media/webspeech/synth/ipc/test/moz.build

@@ -1,7 +0,0 @@
-# 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/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-

content/media/webspeech/synth/moz.build

@@ -4,8 +4,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_WEBSPEECH']:
-
-    TEST_DIRS += ['test', 'ipc/test']
+    MOCHITEST_MANIFESTS += [
+        'ipc/test/mochitest.ini',
+        'test/mochitest.ini',
+    ]
 
     XPIDL_MODULE = 'dom_webspeechsynth'
 

content/media/webspeech/synth/test/moz.build

@@ -1,7 +0,0 @@
-# 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/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-