Bug 1335873 - Add marionette-harness python tests to root moz.build file, r=mshal
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 01 Mar 2017 11:52:51 -0500
changeset 345468 290234233d6bee7dc87db5f59f076f2c039e412d
parent 345467 42c74dd948b9fb34695555396daa4a6e09056198
child 345469 d23c02b2fed0cb0497a596f1f720f53dbbdc2f24
push id31437
push usercbook@mozilla.com
push dateThu, 02 Mar 2017 13:00:04 +0000
treeherdermozilla-central@180a160ae22a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1335873
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 1335873 - Add marionette-harness python tests to root moz.build file, r=mshal The marionette-harness tests should be runnable even without an objdir, however the marionette moz.build file doesn't get included without a build via the DIRS variable. This change gets around that issue by specifically including the marionette-harness manifest from the root moz.build, though maybe it would be better to always process the testing/marionette/moz.build file, and move things that need to behind an "if CONFIG['MOZ_BUILD_APP']" condition? MozReview-Commit-ID: Ata99evHxbd
moz.build
--- a/moz.build
+++ b/moz.build
@@ -80,11 +80,17 @@ if CONFIG['COMPILE_ENVIRONMENT']:
     DIRS += ['js/src']
 else:
     TEST_DIRS += ['js/src/tests']
 
 if not CONFIG['JS_STANDALONE'] and CONFIG['MOZ_BUILD_APP']:
     # Bring in the configuration for the configured application.
     include('/' + CONFIG['MOZ_BUILD_APP'] + '/app.mozbuild')
 
+if not CONFIG['JS_STANDALONE']:
+    # These python manifests are included here so they get picked up without an objdir
+    PYTHON_UNITTEST_MANIFESTS += [
+        'testing/marionette/harness/marionette_harness/tests/harness_unit/python.ini',
+    ]
+
 CONFIGURE_SUBST_FILES += ['.cargo/config']
 
 include('build/templates.mozbuild')