Changeset 56372 in webkit


Ignore:
Timestamp:
Mar 22, 2010 6:13:22 PM (14 years ago)
Author:
eric@webkit.org
Message:

2010-03-22 Csaba Osztrogonác <Csaba Osztrogonác>

Reviewed by Adam Barth.

Make build_webkit_command() pass MAKEFLAGS environment variable to make.
https://bugs.webkit.org/show_bug.cgi?id=36440

  • Scripts/webkitpy/webkitport.py:
  • Scripts/webkitpy/webkitport_unittest.py:
Location:
trunk/WebKitTools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r56366 r56372  
     12010-03-22  Csaba Osztrogonác  <ossy@webkit.org>
     2
     3        Reviewed by Adam Barth.
     4
     5        Make build_webkit_command() pass MAKEFLAGS environment variable to make.
     6        https://bugs.webkit.org/show_bug.cgi?id=36440
     7
     8        * Scripts/webkitpy/webkitport.py:
     9        * Scripts/webkitpy/webkitport_unittest.py:
     10
    1112010-03-22  Dirk Pranke  <dpranke@chromium.org>
    212
  • trunk/WebKitTools/Scripts/webkitpy/webkitport.py

    r53729 r56372  
    5252        # FIXME: We should default to WinPort on Windows.
    5353        return ports.get(port_name, MacPort)
     54
     55    @staticmethod
     56    def makeArgs():
     57        args = '--makeargs="-j%s"' % Executive.cpu_count()
     58        if os.environ.has_key('MAKEFLAGS'):
     59            args = '--makeargs="%s"' % os.environ['MAKEFLAGS']
     60        return args
    5461
    5562    @classmethod
     
    116123        command = WebKitPort.build_webkit_command(build_style=build_style)
    117124        command.append("--gtk")
    118         command.append('--makeargs="-j%s"' % Executive.cpu_count())
     125        command.append(WebKitPort.makeArgs())
    119126        return command
    120127
     
    140147        command = WebKitPort.build_webkit_command(build_style=build_style)
    141148        command.append("--qt")
    142         command.append('--makeargs="-j%s"' % Executive.cpu_count())
     149        command.append(WebKitPort.makeArgs())
    143150        return command
    144151
  • trunk/WebKitTools/Scripts/webkitpy/webkitport_unittest.py

    r53011 r56372  
    4747        self.assertEquals(GtkPort.flag(), "--port=gtk")
    4848        self.assertEquals(GtkPort.run_webkit_tests_command(), [WebKitPort.script_path("run-webkit-tests"), "--gtk"])
    49         self.assertEquals(GtkPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--gtk", '--makeargs="-j%s"' % Executive.cpu_count()])
    50         self.assertEquals(GtkPort.build_webkit_command(build_style="debug"), [WebKitPort.script_path("build-webkit"), "--debug", "--gtk", '--makeargs="-j%s"' % Executive.cpu_count()])
     49        self.assertEquals(GtkPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--gtk", WebKitPort.makeArgs()])
     50        self.assertEquals(GtkPort.build_webkit_command(build_style="debug"), [WebKitPort.script_path("build-webkit"), "--debug", "--gtk", WebKitPort.makeArgs()])
    5151
    5252    def test_qt_port(self):
     
    5454        self.assertEquals(QtPort.flag(), "--port=qt")
    5555        self.assertEquals(QtPort.run_webkit_tests_command(), [WebKitPort.script_path("run-webkit-tests")])
    56         self.assertEquals(QtPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--qt", '--makeargs="-j%s"' % Executive.cpu_count()])
    57         self.assertEquals(QtPort.build_webkit_command(build_style="debug"), [WebKitPort.script_path("build-webkit"), "--debug", "--qt", '--makeargs="-j%s"' % Executive.cpu_count()])
     56        self.assertEquals(QtPort.build_webkit_command(), [WebKitPort.script_path("build-webkit"), "--qt", WebKitPort.makeArgs()])
     57        self.assertEquals(QtPort.build_webkit_command(build_style="debug"), [WebKitPort.script_path("build-webkit"), "--debug", "--qt", WebKitPort.makeArgs()])
    5858
    5959    def test_chromium_port(self):
Note: See TracChangeset for help on using the changeset viewer.