Merge pull request #3013 from servo/travisfix

Emergency fix for broken tree (mozlog update); r=Ms2ger
This commit is contained in:
Ms2ger 2014-08-05 13:19:05 +02:00
commit e7a9b5b9e3
2 changed files with 3 additions and 6 deletions

View file

@ -1,8 +1,3 @@
[status-basic.htm]
type: testharness
[XMLHttpRequest: status/statusText - various responses 7 (GET 402)]
expected: FAIL
[XMLHttpRequest: status/statusText - various responses 9 (CHICKEN 402)]
expected: FAIL
disabled: true

View file

@ -16,6 +16,8 @@ source _virtualenv/bin/activate
if [[ $* == *--update-manifest* ]]; then
(python -c "import html5lib" &>/dev/null) || pip install html5lib
fi
(python -c "import mozlog" &>/dev/null) || pip install mozlog==2.1 #Temporary fix for broken tree
(python -c "import wptrunner" &>/dev/null) || pip install 'wptrunner==1.0'
python $servo_root/src/test/wpt/run.py \