servoshell: Rename executable to servoshell.

This should help clarify the difference between servo the library /
engine and servoshell the browser (demo).

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>

Author: jschwe

tools/wpt/browser.py

@@ -2315,7 +2315,7 @@ def install(self, dest=None, channel="nightly"):
 
         resp = self._get(channel)
         decompress(resp.raw, dest=dest)
-        path = which("servo", path=os.path.join(dest, "servo"))
+        path = which("servoshell", path=os.path.join(dest, "servo"))
         st = os.stat(path)
         os.chmod(path, st.st_mode | stat.S_IEXEC)
         return path

tools/wpt/run.py

@@ -721,7 +721,7 @@ def setup_kwargs(self, kwargs):
             binary = self.browser.find_binary(self.venv.path, None)
 
             if binary is None:
-                raise WptrunError("Unable to find servo binary in PATH")
+                raise WptrunError("Unable to find servoshell binary in PATH")
             kwargs["binary"] = binary
 
 
@@ -738,7 +738,7 @@ def setup_kwargs(self, kwargs):
             binary = self.browser.find_binary(self.venv.path, None)
 
             if binary is None:
-                raise WptrunError("Unable to find servo binary in PATH")
+                raise WptrunError("Unable to find servoshell binary in PATH")
             kwargs["binary"] = binary
 
 

tools/wptrunner/wptrunner/browsers/servo_legacy.py

@@ -95,7 +95,7 @@ def executor_browser(self):
 
 class ServoLegacyWdspecBrowser(WebDriverBrowser):
     # TODO: could share an implemenation with servodriver.py, perhaps
-    def __init__(self, logger, binary="servo", webdriver_binary="servo",
+    def __init__(self, logger, binary="servoshell", webdriver_binary="servoshell",
                  binary_args=None, webdriver_args=None, env=None, port=None,
                  headless=None,
                  **kwargs):