Changeset 56372 in webkit
- Timestamp:
- Mar 22, 2010 6:13:22 PM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r56366 r56372 1 2010-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 1 11 2010-03-22 Dirk Pranke <dpranke@chromium.org> 2 12 -
trunk/WebKitTools/Scripts/webkitpy/webkitport.py
r53729 r56372 52 52 # FIXME: We should default to WinPort on Windows. 53 53 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 54 61 55 62 @classmethod … … 116 123 command = WebKitPort.build_webkit_command(build_style=build_style) 117 124 command.append("--gtk") 118 command.append( '--makeargs="-j%s"' % Executive.cpu_count())125 command.append(WebKitPort.makeArgs()) 119 126 return command 120 127 … … 140 147 command = WebKitPort.build_webkit_command(build_style=build_style) 141 148 command.append("--qt") 142 command.append( '--makeargs="-j%s"' % Executive.cpu_count())149 command.append(WebKitPort.makeArgs()) 143 150 return command 144 151 -
trunk/WebKitTools/Scripts/webkitpy/webkitport_unittest.py
r53011 r56372 47 47 self.assertEquals(GtkPort.flag(), "--port=gtk") 48 48 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()]) 51 51 52 52 def test_qt_port(self): … … 54 54 self.assertEquals(QtPort.flag(), "--port=qt") 55 55 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()]) 58 58 59 59 def test_chromium_port(self):
Note: See TracChangeset
for help on using the changeset viewer.