Bug 1416052 - Remove references to MOZ_CURRENT_PROJECT; r=nalexander
authorGregory Szorc <gps@mozilla.com>
Thu, 09 Nov 2017 21:47:43 -0800
changeset 443566 4a26fbabb7d8d8080c1280f46e6eb7793fa134e3
parent 443565 ee45241c58eb84dbc37c6a2ecb37187876e922d7
child 443567 67c03dc70bfd5d2d3df5986d64240494f4624d55
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1416052, 1412431
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 1416052 - Remove references to MOZ_CURRENT_PROJECT; r=nalexander Actual uses of this variable were removed by 5fb427c50ca3 (bug 1412431). This is dead code. MozReview-Commit-ID: GsDqpXZol2L
python/mozbuild/mozbuild/mach_commands.py
python/mozbuild/mozbuild/test/test_base.py
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -1092,18 +1092,16 @@ class MachDebug(MachCommandBase):
     def _environment_client_mk(self, out, verbose):
         if self.mozconfig['make_extra']:
             for arg in self.mozconfig['make_extra']:
                 print(arg, file=out)
         if self.mozconfig['make_flags']:
             print('MOZ_MAKE_FLAGS=%s' % ' '.join(self.mozconfig['make_flags']))
         objdir = mozpath.normsep(self.topobjdir)
         print('MOZ_OBJDIR=%s' % objdir, file=out)
-        if 'MOZ_CURRENT_PROJECT' in os.environ:
-            objdir = mozpath.join(objdir, os.environ['MOZ_CURRENT_PROJECT'])
         print('OBJDIR=%s' % objdir, file=out)
         if self.mozconfig['path']:
             print('FOUND_MOZCONFIG=%s' % mozpath.normsep(self.mozconfig['path']),
                 file=out)
 
     def _environment_json(self, out, verbose):
         import json
         class EnvironmentEncoder(json.JSONEncoder):
--- a/python/mozbuild/mozbuild/test/test_base.py
+++ b/python/mozbuild/mozbuild/test/test_base.py
@@ -37,17 +37,16 @@ log_manager = LoggingManager()
 
 
 class TestMozbuildObject(unittest.TestCase):
     def setUp(self):
         self._old_cwd = os.getcwd()
         self._old_env = dict(os.environ)
         os.environ.pop('MOZCONFIG', None)
         os.environ.pop('MOZ_OBJDIR', None)
-        os.environ.pop('MOZ_CURRENT_PROJECT', None)
 
     def tearDown(self):
         os.chdir(self._old_cwd)
         os.environ.clear()
         os.environ.update(self._old_env)
 
     def get_base(self, topobjdir=None):
         return MozbuildObject(topsrcdir, None, log_manager, topobjdir=topobjdir)