mozilla
/
arewefastyet
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

This commit is contained in:
Dhananjay Nakrani 2015-10-01 13:17:47 -07:00
Родитель e54774645b
Коммит a2bf20294d
3 изменённых файлов: 5 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
slave/build.py
Просмотреть файл

@ -96,7 +96,9 @@ class Builder(object):
info = self.retrieveInfo() info = self.retrieveInfo()
info["revision"] = puller.identify() 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()) info["binary"] = os.path.abspath(self.binary())
fp = open(os.path.join(self.folder, "info.json"), "w") fp = open(os.path.join(self.folder, "info.json"), "w")
@ -249,6 +251,7 @@ class ServoBuilder(Builder):
def retrieveInfo(self): def retrieveInfo(self):
info = {} info = {}
info["engine_type"] = "servo" info["engine_type"] = "servo"
info['shell'] = False
return info return info
def objdir(self): def objdir(self):
@ -262,16 +265,6 @@ class ServoBuilder(Builder):
args = [os.path.join('.', 'mach'), 'build' ,'--release'] args = [os.path.join('.', 'mach'), 'build' ,'--release']
Run(args, self.env.get()) 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): def getBuilder(config, path):
# fingerprint the known builders # fingerprint the known builders
if os.path.exists(os.path.join(path, "js", "src")): if os.path.exists(os.path.join(path, "js", "src")):

1
slave/executors.py
Просмотреть файл

@ -4,7 +4,6 @@ import os
import sys import sys
import json import json
sys.path.insert(1, '../driver')
import utils import utils
class ShellExecutor(object): class ShellExecutor(object):

2
website/index.html
Просмотреть файл

@ -3,7 +3,7 @@
<head> <head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"> <meta http-equiv="content-type" content="text/html; charset=UTF-8">
<meta http-equiv="content-language" content="en"> <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="stylesheet" title="Default Stylesheet" type="text/css" href="style.css">
<link rel="shortcut icon" href="//www.arewefastyet.com/awfy_favicon.png"> <link rel="shortcut icon" href="//www.arewefastyet.com/awfy_favicon.png">
<link href='//fonts.googleapis.com/css?family=Lato' rel='stylesheet' type='text/css'> <link href='//fonts.googleapis.com/css?family=Lato' rel='stylesheet' type='text/css'>