auto merge of #3476 : Ms2ger/servo/rm-hotfix, r=Ms2ger,metajack

This was added in anticipation of a wptrunner release that includes the change.
This commit is contained in:
bors-servo 2014-09-29 08:51:29 -06:00
commit e70dcc3ae5

View file

@ -16,11 +16,7 @@ source _virtualenv/bin/activate
if [[ $* == *--update-manifest* ]]; then
(python -c "import html5lib" &>/dev/null) || pip install html5lib
fi
(python -c "import wptrunner" &>/dev/null) || pip install 'wptrunner==1.0'
# Patch wptrunner to run servo in cpu mode
sed 's."--hard-fail",."--hard-fail", "-c",.' _virtualenv/lib/python2.7/site-packages/wptrunner/executors/executorservo.py > _virtualenv/lib/python2.7/site-packages/wptrunner/executors/executorservo.py.new
mv _virtualenv/lib/python2.7/site-packages/wptrunner/executors/executorservo.py.new _virtualenv/lib/python2.7/site-packages/wptrunner/executors/executorservo.py
(python -c "import wptrunner" &>/dev/null) || pip install 'wptrunner==1.2'
python $servo_root/tests/wpt/run.py \
--config $servo_root/tests/wpt/config.ini \