Bug 1416052 - Remove references to MOZ_CURRENT_PROJECT; r=nalexander draft
authorGregory Szorc <gps@mozilla.com>
Thu, 09 Nov 2017 21:47:43 -0800
changeset 697342 d86f00b120dd5fadacc7d27df3b0aaa39afb7e78
parent 697341 8de8ac1009f65993b25a14d25d68b4abc98a4cc8
child 697343 b1380e8cda858a7c5144c14d2626f4687541acfb
push id88985
push userbmo:gps@mozilla.com
push dateMon, 13 Nov 2017 23:04:28 +0000
reviewersnalexander
bugs1416052, 1412431
milestone59.0a1
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)