From 81bfa3196db15234c296d3c7818d11c490d4ab54 Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahalberstadt@mozilla.com>
Date: Wed, 1 Feb 2017 09:56:33 -0500
Subject: [PATCH] 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
--HG--
extra : rebase_source : 46c2386e3a6fc2106f8277fde1363e4c28457d0f
---
moz.build | 1 +
toolkit/toolkit.mozbuild | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/moz.build b/moz.build
index 2421088ca33a6..edb9d4f654252 100644
--- a/moz.build
+++ b/moz.build
@@ -22,6 +22,7 @@ DIRS += [
'config',
'python',
'taskcluster',
+ 'testing/mozbase',
]
if not CONFIG['JS_STANDALONE']:
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 0569a1452475e..023596f306c1d 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -176,7 +176,6 @@ if CONFIG['ENABLE_TESTS']:
'/testing/tools/minidumpwriter',
'/testing/tools/screenshot',
'/testing/profiles',
- '/testing/mozbase',
'/testing/modules',
'/testing/runtimes',
'/testing/web-platform',
--
GitLab