Bug 1003417 - Include testing/mozbase/moz.build from root moz.build file, r=ted
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 01 Feb 2017 09:56:33 -0500
changeset 343289 091f6e30f5dc5f9e29f8b937270ee09dc484bd43
parent 343288 35ddc6aaed8b049f3c8dc4b05a701bf92409fb92
child 343290 12a434138e95586aa6019ff416d2be89afad459f
push id31376
push userkwierso@gmail.com
push dateFri, 17 Feb 2017 01:09:40 +0000
treeherdermozilla-central@6cefe01ca774 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1003417
milestone54.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 1003417 - Include testing/mozbase/moz.build from root moz.build file, r=ted By including the mozbase's moz.build directly in the root moz.build, we are making sure that mozbase unittests will be found even if there is no build/objdir. This will be useful when running mozbase tests in their own taskcluster task. MozReview-Commit-ID: DqqY09I3JBC
moz.build
toolkit/toolkit.mozbuild
--- a/moz.build
+++ b/moz.build
@@ -17,16 +17,17 @@ CONFIGURE_SUBST_FILES += [
 
 if CONFIG['ENABLE_CLANG_PLUGIN']:
     DIRS += ['build/clang-plugin']
 
 DIRS += [
     'config',
     'python',
     'taskcluster',
+    'testing/mozbase',
 ]
 
 if not CONFIG['JS_STANDALONE']:
     CONFIGURE_SUBST_FILES += [
         'tools/update-packaging/Makefile',
     ]
     CONFIGURE_DEFINE_FILES += [
         'mozilla-config.h',
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -171,17 +171,16 @@ DIRS += [
 
 if CONFIG['ENABLE_TESTS']:
     DIRS += [
         '/testing/mochitest',
         '/testing/xpcshell',
         '/testing/tools/minidumpwriter',
         '/testing/tools/screenshot',
         '/testing/profiles',
-        '/testing/mozbase',
         '/testing/modules',
         '/testing/runtimes',
         '/testing/web-platform',
     ]
 
     # The file id utility requires breakpad libraries.
     if CONFIG['MOZ_CRASHREPORTER']:
         DIRS += ['/testing/tools/fileid']