Bug 1429158 - Ensure 'six' and 'mozterm' are available from the one-click-loaner mach environment, r=jmaher
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Tue, 09 Jan 2018 14:29:45 -0500
changeset 452759 b015e89b1064b5f0958ad2b945c9b2fdbe18f48f
parent 452758 ccb64910979ad80245221ad8baa2e6dd4b7a5b20
child 452760 ed6cf025df1352cf5f9e8f6be8d09debf5b69801
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1429158
milestone59.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 1429158 - Ensure 'six' and 'mozterm' are available from the one-click-loaner mach environment, r=jmaher Mach itself now depends on 'six', so it needs to be packaged in the test archive. MozReview-Commit-ID: 8lWc0cxwrss
python/mozbuild/mozbuild/action/test_archive.py
testing/tools/mach_test_package_bootstrap.py
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -222,16 +222,22 @@ ARCHIVE_FILES = {
         },
         {
             'source': buildconfig.topsrcdir,
             'base': 'python/mozterm',
             'pattern': '**',
             'dest': 'tools/mozterm',
         },
         {
+            'source': buildconfig.topsrcdir,
+            'base': 'third_party/python/six',
+            'pattern': '**',
+            'dest': 'tools/six',
+        },
+        {
             'source': buildconfig.topobjdir,
             'base': '',
             'pattern': 'mozinfo.json',
         },
         {
             'source': buildconfig.topobjdir,
             'base': 'dist/bin',
             'patterns': [
--- a/testing/tools/mach_test_package_bootstrap.py
+++ b/testing/tools/mach_test_package_bootstrap.py
@@ -31,16 +31,18 @@ SEARCH_PATHS = [
     'mozbase/mozprofile',
     'mozbase/mozrunner',
     'mozbase/mozscreenshot',
     'mozbase/mozsystemmonitor',
     'mozbase/moztest',
     'mozbase/mozversion',
     'reftest',
     'tools/mach',
+    'tools/mozterm',
+    'tools/six',
     'tools/wptserve',
     'web-platform',
     'web-platform/tests/tools/wptrunner',
     'xpcshell',
 ]
 
 # Individual files providing mach commands.
 MACH_MODULES = [