Bug 1070709 - Collapse test-only moz.build files under image/ into ancestor moz.build files. r=mshal
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Fri, 26 Sep 2014 07:20:23 +0300
changeset 207396 5fbee18910049e306d89b8888247cdda4fd61db2
parent 207395 637e9fa4a5bb12190034d6f64ab853312d3c9b94
child 207397 99b8aa0721f439235945b743a437f1ae2614f98e
push id27552
push usercbook@mozilla.com
push dateFri, 26 Sep 2014 11:21:05 +0000
treeherdermozilla-central@31db6c04c40e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1070709
milestone35.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 1070709 - Collapse test-only moz.build files under image/ into ancestor moz.build files. r=mshal
image/moz.build
image/test/browser/moz.build
image/test/mochitest/moz.build
image/test/moz.build
--- a/image/moz.build
+++ b/image/moz.build
@@ -1,10 +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 += ['public', 'src', 'decoders', 'encoders']
 DIRS += ['build']
-TEST_DIRS += ['test']
+
+BROWSER_CHROME_MANIFESTS += ['test/browser/browser.ini']
 
+MOCHITEST_MANIFESTS += ['test/mochitest/mochitest.ini']
+
+MOCHITEST_CHROME_MANIFESTS += ['test/mochitest/chrome.ini']
+
+XPCSHELL_TESTS_MANIFESTS += ['test/unit/xpcshell.ini']
deleted file mode 100644
--- a/image/test/browser/moz.build
+++ /dev/null
@@ -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/.
-
-BROWSER_CHROME_MANIFESTS += ['browser.ini']
-
deleted file mode 100644
--- a/image/test/mochitest/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/.
-
-MOCHITEST_MANIFESTS += ['mochitest.ini']
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-
deleted file mode 100644
--- a/image/test/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/.
-
-TEST_DIRS += ['mochitest', 'browser']
-
-XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']