2011-03-24 Dirk Pranke <dpranke@chromium.org>
authordpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Mar 2011 23:44:17 +0000 (23:44 +0000)
committerdpranke@chromium.org <dpranke@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Mar 2011 23:44:17 +0000 (23:44 +0000)
        Reviewed by Adam Barth.

        fix regressions introduced in 81908 - there were a couple of
        code paths that only fired under python 2.5 that I missed.

        Also change a couple of 'python' references to sys.executable
        in order to handle runing test-webkitpy with a binary other than
        something called 'python'.

        https://bugs.webkit.org/show_bug.cgi?id=57063

        * Scripts/webkitpy/layout_tests/port/mac.py:
        * Scripts/webkitpy/layout_tests/port/port_testcase.py:
        * Scripts/webkitpy/test/cat.py:
        * Scripts/webkitpy/test/echo.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@81918 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/port/mac.py
Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
Tools/Scripts/webkitpy/test/cat.py
Tools/Scripts/webkitpy/test/echo.py

index 61cb658c22db59f3af47cce832674cb6fe2435b3..5581709f95b0d4a74cffb5b1d1619fecaf2cafcd 100644 (file)
@@ -1,3 +1,21 @@
+2011-03-24  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        fix regressions introduced in 81908 - there were a couple of
+        code paths that only fired under python 2.5 that I missed.
+
+        Also change a couple of 'python' references to sys.executable
+        in order to handle runing test-webkitpy with a binary other than
+        something called 'python'.
+
+        https://bugs.webkit.org/show_bug.cgi?id=57063
+
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+        * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+        * Scripts/webkitpy/test/cat.py:
+        * Scripts/webkitpy/test/echo.py:
+
 2011-03-24  Brent Fulgham  <bfulgham@webkit.org>
 
         Unreviewed build correction.
index 0168ec7b42411f562c3a50dc034ab9fba2201419..43155432039b4ac69371df7871070c87f752ab7d 100644 (file)
@@ -88,14 +88,14 @@ class MacPort(WebKitPort):
         # four threads in parallel.
         # See https://bugs.webkit.org/show_bug.cgi?id=36622
         child_processes = WebKitPort.default_child_processes(self)
-        if self.get_option('worker_model') == 'old-threads' and child_processes > 4:
+        if not self._multiprocessing_is_available and child_processes > 4:
             return 4
         return child_processes
 
     def default_worker_model(self):
         if self._multiprocessing_is_available:
             return 'processes'
-        return 'old-threads'
+        return 'threads'
 
     def baseline_search_path(self):
         return map(self._webkit_baseline_path, self.FALLBACK_PATHS[self._version])
index d37fdc09a808459db19b2f4b424094f81d9fbda2..649e33cf878cc04b74e3d4ee0e79ea987b0def59 100644 (file)
@@ -73,7 +73,7 @@ class PortTestCase(unittest.TestCase):
         if multiprocessing:
             self.assertEqual(port.default_worker_model(), 'processes')
         else:
-            self.assertEqual(port.default_worker_model(), 'old-threads')
+            self.assertEqual(port.default_worker_model(), 'threads')
 
     def test_driver_cmd_line(self):
         port = self.make_port()
index ae1e143eb45691685d03f9f23a6e91c0879bcd8e..ac56d1c7f178d3ef4bc00a45ca4f062a36658dd2 100644 (file)
@@ -30,7 +30,7 @@ from webkitpy.common.system import fileutils
 
 
 def command_arguments(*args):
-    return ['python', __file__] + list(args)
+    return [sys.executable, __file__] + list(args)
 
 
 def main():
index f7468f70d6cc76492119edc07e9f4cfef05ec483..5d4d8e2d52b8f9c60428b3ba32e3020e9427d1c9 100644 (file)
@@ -30,7 +30,7 @@ from webkitpy.common.system import fileutils
 
 
 def command_arguments(*args):
-    return ['python', __file__] + list(args)
+    return [sys.executable, __file__] + list(args)
 
 
 def main(args=None):