Bug 1545343 - Run mozharness tests with the intended command line on Windows. r=tomprince
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 23 Apr 2019 20:45:40 +0000
changeset 470577 2d7e3754d9660de1fd99ac145fd89318c4d84c6d
parent 470576 a66f1ffd23ea29db37a0f1b11141c1fe6699dddb
child 470578 71fa880095b091e20a73fd700cce94ee32253297
push id35908
push useraciure@mozilla.com
push dateWed, 24 Apr 2019 04:28:40 +0000
treeherdermozilla-central@c9f0730a57a6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince
bugs1545343, 1474897
milestone68.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 1545343 - Run mozharness tests with the intended command line on Windows. r=tomprince Bug 1474897 changed things such that Windows builds ended up in the linux/macosx branch. That still works somehow, but ends up breaking when wrapping with run-task. This change restores the originally intended command line. Differential Revision: https://phabricator.services.mozilla.com/D28017
taskcluster/taskgraph/transforms/job/mozharness_test.py
--- a/taskcluster/taskgraph/transforms/job/mozharness_test.py
+++ b/taskcluster/taskgraph/transforms/job/mozharness_test.py
@@ -301,17 +301,17 @@ def mozharness_test_on_generic_worker(co
     env['EXTRA_MOZHARNESS_CONFIG'] = {'task-reference': json.dumps(extra_config)}
 
     if is_windows:
         mh_command = [
             'c:\\mozilla-build\\python\\python.exe',
             '-u',
             'mozharness\\scripts\\' + normpath(mozharness['script'])
         ]
-    if is_bitbar:
+    elif is_bitbar:
         mh_command = [
             bitbar_wrapper,
             'bash',
             "./{}".format(bitbar_script)
         ]
     else:
         # is_linux or is_macosx
         mh_command = [