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:

git-svn-id: svn://svn.chromium.org/blink/trunk@81918 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Tools/ChangeLog

+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.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/mac.py

@@ -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])

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py

@@ -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()

third_party/WebKit/Tools/Scripts/webkitpy/test/cat.py

@@ -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():

third_party/WebKit/Tools/Scripts/webkitpy/test/echo.py

@@ -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):