Bug 1335873 - Add marionette-harness python tests to root moz.build file, r?mshal draft
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 01 Mar 2017 11:52:51 -0500
changeset 491144 e6a67dd12c5a1c3a09ec2c7bcc4091085a302035
parent 491143 45e481fe4caef53472bf56d40c13158dd2eb3c20
child 491145 3e235e743c0845f3a70e37ccb09c26f11d0e0e6a
push id47332
push userahalberstadt@mozilla.com
push dateWed, 01 Mar 2017 20:43:26 +0000
reviewersmshal
bugs1335873
milestone54.0a1
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')