Bug 1003417 - Include testing/mozbase/moz.build from root moz.build file, r?ted draft
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 01 Feb 2017 09:56:33 -0500
changeset 480649 4ddf8fa849f6ee12ab56ffa53a5c5c4ad896a696
parent 480648 479821e62c2b46b65bfe3d089c5553ce590eecd0
child 480650 85bc133a952b2a9f46f8a7af12edb4341a9561cb
push id44617
push userahalberstadt@mozilla.com
push dateWed, 08 Feb 2017 19:29:51 +0000
reviewersted
bugs1003417
milestone54.0a1
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']