Changeset 80549 in webkit

Timestamp:

Mar 8, 2011 1:06:42 AM (13 years ago)

Author:

Patrick Gansterer

Message:

2011-03-08 Patrick Gansterer <Patrick Gansterer>

Reviewed by Adam Barth.

Add script_shell_command to WebKitPort
​https://bugs.webkit.org/show_bug.cgi?id=55925

Add a central place where we generate the shell command from the script name.
This function will be used later to detect the correct script interpreter on Win32.

• Scripts/webkitpy/common/config/ports.py:
• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/tool/steps/abstractstep.py:
• Scripts/webkitpy/tool/steps/preparechangelog.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/config/ports.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/abstractstep.py (modified) (1 diff)
• Scripts/webkitpy/tool/steps/preparechangelog.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-03-08  Patrick Gansterer  <paroga@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Add script_shell_command to WebKitPort
+        https://bugs.webkit.org/show_bug.cgi?id=55925
+
+        Add a central place where we generate the shell command from the script name.
+        This function will be used later to detect the correct script interpreter on Win32.
+
+        * Scripts/webkitpy/common/config/ports.py:
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/tool/steps/abstractstep.py:
+        * Scripts/webkitpy/tool/steps/preparechangelog.py:
+
 2011-03-07  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/Scripts/webkitpy/common/config/ports.py

@@ -41 +41 @@
     def script_path(cls, script_name):
         return os.path.join("Tools", "Scripts", script_name)
+
+    @classmethod
+    def script_shell_command(cls, script_name):
+        return [cls.script_path(script_name)]
 
     @staticmethod
@@ -77 +81 @@
     @classmethod
     def update_webkit_command(cls):
-        return [cls.script_path("update-webkit")]
-
-    @classmethod
-    def build_webkit_command(cls, build_style=None):
-        command = [cls.script_path("build-webkit")]
+        return cls.script_shell_command("update-webkit")
+
+    @classmethod
+    def build_webkit_command(cls, build_style=None):
+        command = cls.script_shell_command("build-webkit")
         if build_style == "debug":
             command.append("--debug")
@@ -90 +94 @@
     @classmethod
     def run_javascriptcore_tests_command(cls):
-        return [cls.script_path("run-javascriptcore-tests")]
-
-    @classmethod
-    def run_webkit_tests_command(cls):
-        return [cls.script_path("run-webkit-tests")]
+        return cls.script_shell_command("run-javascriptcore-tests")
+
+    @classmethod
+    def run_webkit_tests_command(cls):
+        return cls.script_shell_command("run-webkit-tests")
 
     @classmethod
     def run_python_unittests_command(cls):
-        return [cls.script_path("test-webkitpy")]
+        return cls.script_shell_command("test-webkitpy")
 
     @classmethod
     def run_perl_unittests_command(cls):
-        return [cls.script_path("test-webkitperl")]
+        return cls.script_shell_command("test-webkitperl")
 
     @classmethod
@@ -227 +231 @@
     @classmethod
     def run_webkit_tests_command(cls):
-        return [
-            cls.script_path("new-run-webkit-tests"),
-            "--chromium",
-            "--no-pixel-tests",
-        ]
+        command = cls.script_shell_command("new-run-webkit-tests")
+        command.append("--chromium")
+        command.append("--no-pixel-tests")
+        return command
 
     @classmethod

trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -499 +499 @@
         return self._config.script_path(script_name)
 
+    def script_shell_command(self, script_name):
+        return self._config.script_shell_command(script_name)
+
     def path_to_test_expectations_file(self):
         """Update the test expectations to the passed-in string.

trunk/Tools/Scripts/webkitpy/tool/steps/abstractstep.py

@@ -41 +41 @@
     def _run_script(self, script_name, args=None, quiet=False, port=WebKitPort):
         log("Running %s" % script_name)
-        command = [port.script_path(script_name)]
+        command = port.script_shell_command(script_name)
         if args:
             command.extend(args)

trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py

@@ -62 +62 @@
             return
         os.chdir(self._tool.scm().checkout_root)
-        args = [self._tool.port().script_path("prepare-ChangeLog")]
+        args = self._tool.port().script_shell_command("prepare-ChangeLog")
         if state.get("bug_id"):
             args.append("--bug=%s" % state["bug_id"])