Changeset 263649 in webkit


Ignore:
Timestamp:
Jun 29, 2020 2:38:13 AM (4 years ago)
Author:
commit-queue@webkit.org
Message:

REGRESSION(r263625): [WPE][GTK] MiniBrowser output no longer includes stderr and stdout
https://bugs.webkit.org/show_bug.cgi?id=213696

Patch by Philippe Normand <pnormand@igalia.com> on 2020-06-29
Reviewed by Žan Doberšek.

This patch adds a new optional argument to Executive.run_command() to control stdout output.
By default the subprocess.PIPE value is used, to keep backward compatibility. Set the stdout
argument to None to display the output on the terminal tty.

The GTK and WPE run_minibrowser() implementations now use this new argument, along with
setting return_stderr to False to indicate we also want stderr displayed on the terminal
tty.

  • Scripts/webkitpy/common/system/abstractexecutive.py:

(AbstractExecutive.run_command):

  • Scripts/webkitpy/common/system/executive.py:

(Executive.run_command):

  • Scripts/webkitpy/common/system/executive_mock.py:

(MockExecutive.run_command):

  • Scripts/webkitpy/port/gtk.py:

(GtkPort.run_minibrowser):

  • Scripts/webkitpy/port/wpe.py:

(WPEPort.run_minibrowser):

Location:
trunk/Tools
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r263648 r263649  
     12020-06-29  Philippe Normand  <pnormand@igalia.com>
     2
     3        REGRESSION(r263625): [WPE][GTK] MiniBrowser output no longer includes stderr and stdout
     4        https://bugs.webkit.org/show_bug.cgi?id=213696
     5
     6        Reviewed by Žan Doberšek.
     7
     8        This patch adds a new optional argument to Executive.run_command() to control stdout output.
     9        By default the subprocess.PIPE value is used, to keep backward compatibility. Set the stdout
     10        argument to None to display the output on the terminal tty.
     11
     12        The GTK and WPE run_minibrowser() implementations now use this new argument, along with
     13        setting return_stderr to False to indicate we also want stderr displayed on the terminal
     14        tty.
     15
     16        * Scripts/webkitpy/common/system/abstractexecutive.py:
     17        (AbstractExecutive.run_command):
     18        * Scripts/webkitpy/common/system/executive.py:
     19        (Executive.run_command):
     20        * Scripts/webkitpy/common/system/executive_mock.py:
     21        (MockExecutive.run_command):
     22        * Scripts/webkitpy/port/gtk.py:
     23        (GtkPort.run_minibrowser):
     24        * Scripts/webkitpy/port/wpe.py:
     25        (WPEPort.run_minibrowser):
     26
    1272020-06-29  Philippe Normand  <pnormand@igalia.com>
    228
  • trunk/Tools/Scripts/webkitpy/common/system/abstractexecutive.py

    r250375 r263649  
    110110        return unicode_compatibility.decode_if_necessary(unicode_compatibility.encode_if_necessary(' '.join(args), 'unicode_escape'))
    111111
    112     def run_command(self, args, cwd=None, env=None, input=None, error_handler=None, ignore_errors=False,
     112    def run_command(self, args, cwd=None, env=None, input=None, stdout=None, error_handler=None, ignore_errors=False,
    113113        return_exit_code=False, return_stderr=True, decode_output=True):
    114114        raise NotImplementedError('subclasses must implement')
  • trunk/Tools/Scripts/webkitpy/common/system/executive.py

    r258045 r263649  
    384384                    env=None,
    385385                    input=None,
     386                    stdout=subprocess.PIPE,
    386387                    error_handler=None,
    387388                    ignore_errors=False,
     
    398399        process = self.popen(args,
    399400                             stdin=stdin,
    400                              stdout=self.PIPE,
     401                             stdout=stdout,
    401402                             stderr=stderr,
    402403                             cwd=cwd,
  • trunk/Tools/Scripts/webkitpy/common/system/executive_mock.py

    r253128 r263649  
    118118                    cwd=None,
    119119                    input=None,
     120                    stdout=None,
    120121                    error_handler=None,
    121122                    ignore_errors=False,
  • trunk/Tools/Scripts/webkitpy/port/gtk.py

    r263625 r263649  
    270270        if self._should_use_jhbuild():
    271271            command = self._jhbuild_wrapper + command
    272         return self._executive.run_command(command + args, cwd=self.webkit_base())
     272        return self._executive.run_command(command + args, cwd=self.webkit_base(), stdout=None, return_stderr=False, decode_output=False)
  • trunk/Tools/Scripts/webkitpy/port/wpe.py

    r263625 r263649  
    144144        if self._should_use_jhbuild():
    145145            command = self._jhbuild_wrapper + command
    146         return self._executive.run_command(command + args, cwd=self.webkit_base())
     146        return self._executive.run_command(command + args, cwd=self.webkit_base(), stdout=None, return_stderr=False, decode_output=False)
Note: See TracChangeset for help on using the changeset viewer.