Bug 1304508 - Remove final references to pymake in mozharness; r?ted draft
authorGregory Szorc <gps@mozilla.com>
Wed, 26 Apr 2017 13:41:00 -0700
changeset 570925 a23528a5b86d0bf23bfa0ccbf4b1d87c061c1711
parent 570924 3e74c4261b022bf72e3144301eeb52c6a88feb63
child 626612 35c3ce5d6f3fda657e5844530829578074406a55
push id56623
push usergszorc@mozilla.com
push dateMon, 01 May 2017 17:20:54 +0000
reviewersted
bugs1304508
milestone55.0a1
Bug 1304508 - Remove final references to pymake in mozharness; r?ted We shouldn't be running pymake any more. So code to work around its behavior is no longer necessary and can be removed. Good riddance. MozReview-Commit-ID: AlV6ZLiA6WB
testing/mozharness/scripts/desktop_l10n.py
--- a/testing/mozharness/scripts/desktop_l10n.py
+++ b/testing/mozharness/scripts/desktop_l10n.py
@@ -45,23 +45,16 @@ except ImportError:
 
 # needed by _map
 SUCCESS = 0
 FAILURE = 1
 
 SUCCESS_STR = "Success"
 FAILURE_STR = "Failed"
 
-# when running get_output_form_command, pymake has some extra output
-# that needs to be filtered out
-PyMakeIgnoreList = [
-    re.compile(r'''.*make\.py(?:\[\d+\])?: Entering directory'''),
-    re.compile(r'''.*make\.py(?:\[\d+\])?: Leaving directory'''),
-]
-
 
 # mandatory configuration options, without them, this script will not work
 # it's a list of values that are already known before starting a build
 configuration_tokens = ('branch',
                         'platform',
                         'update_platform',
                         'update_channel',
                         'ssh_key_dir',
@@ -505,43 +498,30 @@ class DesktopSingleLocale(LocalesMixin, 
         r = re.compile(r"^(gecko|fx)_revision ([0-9a-f]+\+?)$")
         output = self._query_make_ident_output()
         for line in output.splitlines():
             match = r.match(line)
             if match:
                 self.enUS_revision = match.groups()[1]
         return self.enUS_revision
 
-    def _query_make_variable(self, variable, make_args=None,
-                             exclude_lines=PyMakeIgnoreList):
+    def _query_make_variable(self, variable, make_args=None):
         """returns the value of make echo-variable-<variable>
            it accepts extra make arguements (make_args)
-           it also has an exclude_lines from the output filer
-           exclude_lines defaults to PyMakeIgnoreList because
-           on windows, pymake writes extra output lines that need
-           to be filtered out.
         """
         dirs = self.query_abs_dirs()
         make_args = make_args or []
-        exclude_lines = exclude_lines or []
         target = ["echo-variable-%s" % variable] + make_args
         cwd = dirs['abs_locales_dir']
         raw_output = self._get_output_from_make(target, cwd=cwd,
                                                 env=self.query_bootstrap_env())
-        # we want to log all the messages from make/pymake and
-        # exlcude some messages from the output ("Entering directory...")
+        # we want to log all the messages from make
         output = []
         for line in raw_output.split("\n"):
-            discard = False
-            for element in exclude_lines:
-                if element.match(line):
-                    discard = True
-                    continue
-            if not discard:
-                output.append(line.strip())
+            output.append(line.strip())
         output = " ".join(output).strip()
         self.info('echo-variable-%s: %s' % (variable, output))
         return output
 
     def query_version(self):
         """Gets the version from the objdir.
         Only valid after setup is run."""
         if self.version: