Bug 1480142 - Pass test paths relative to the Marionette test install dir to the Marionette test runner. r=whimboo
authorMarco Castelluccio <mcastelluccio@mozilla.com>
Tue, 20 Nov 2018 17:25:34 +0100
changeset 503708 eed5fefba0897a4dfd2ad9ae9408a02fcc024976
parent 503707 b4617999a4f3b97b6384d6d352f89742ea3b44d7
child 503709 378d0c633eaee8cac785d3f0aa0e24f397efa6e2
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo
bugs1480142
milestone65.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 1480142 - Pass test paths relative to the Marionette test install dir to the Marionette test runner. r=whimboo
testing/mozharness/scripts/marionette.py
--- a/testing/mozharness/scripts/marionette.py
+++ b/testing/mozharness/scripts/marionette.py
@@ -302,17 +302,19 @@ class MarionetteTest(TestingMixin, Mercu
         for arg in self.config["suite_definitions"][self.test_suite]["options"]:
             cmd.append(arg % config_fmt_args)
 
         if self.mkdir_p(dirs["abs_blob_upload_dir"]) == -1:
             # Make sure that the logging directory exists
             self.fatal("Could not create blobber upload directory")
 
         if os.environ.get('MOZHARNESS_TEST_PATHS'):
-            cmd.extend(os.environ['MOZHARNESS_TEST_PATHS'].split(':'))
+            paths = [os.path.join(dirs['abs_test_install_dir'], 'marionette', 'tests', p)
+                     for p in os.environ['MOZHARNESS_TEST_PATHS'].split(':')]
+            cmd.extend(paths)
         else:
             cmd.append(manifest)
 
         try_options, try_tests = self.try_args("marionette")
         cmd.extend(self.query_tests_args(try_tests,
                                          str_format_values=config_fmt_args))
 
         env = {}