Change hack around Shell=False for Servo Builds. Remove extra driver inclusion.

2015-10-01 13:17:47 -07:00 · 2015-10-01 13:17:47 -07:00 · a2bf20294d
--- a/slave/build.py
+++ b/slave/build.py
@ -96,7 +96,9 @@ class Builder(object):

        info = self.retrieveInfo()
        info["revision"] = puller.identify()
-        info["shell"] = True
+        # Deafult 'shell' to True only if it isn't set yet!
+        if 'shell' not in info:
+            info["shell"] = True
        info["binary"] = os.path.abspath(self.binary())

        fp = open(os.path.join(self.folder, "info.json"), "w")
@ -249,6 +251,7 @@ class ServoBuilder(Builder):
    def retrieveInfo(self):
        info = {}
        info["engine_type"] = "servo"
+        info['shell'] = False
        return info

    def objdir(self):
@ -262,16 +265,6 @@ class ServoBuilder(Builder):
            args = [os.path.join('.', 'mach'), 'build' ,'--release']
            Run(args, self.env.get())

-    def build(self, puller):
-        # Call parent's build
-        super(ServoBuilder, self).build(puller)
-        # Read info.json file back and modify only shell=False.
-        with open(os.path.join(self.folder, "info.json"),  'r+') as info_file:
-            info = json.load(info_file)
-            info["shell"] = False
-            info_file.seek(0)
-            json.dump(info, info_file)
-
 def getBuilder(config, path):
    # fingerprint the known builders
    if os.path.exists(os.path.join(path, "js", "src")):
--- a/slave/executors.py
+++ b/slave/executors.py
@ -4,7 +4,6 @@ import os
 import sys
 import json

-sys.path.insert(1, '../driver')
 import utils

 class ShellExecutor(object):
--- a/website/index.html
+++ b/website/index.html
@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 <meta http-equiv="content-language" content="en">
- <title>ARE WE FAST YET?</title>
+ <title>Servo Benchmarking</title>
 <link rel="stylesheet" title="Default Stylesheet" type="text/css" href="style.css">
 <link rel="shortcut icon" href="//www.arewefastyet.com/awfy_favicon.png">
 <link href='//fonts.googleapis.com/css?family=Lato' rel='stylesheet' type='text/css'>