diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-09-29 08:51:29 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-09-29 08:51:29 -0600 |
| commit | e70dcc3ae55c743bab2aa4b35cbfd8dcf11f799a (patch) | |
| tree | 656e2bca7da1f28e13a36ca4f8aa2e71e6323e94 | |
| parent | 760f28b551ac25dbd60a0abf822cebf3ff1287a1 (diff) | |
| parent | 8dbe2b352b1e75b0457949fce5136a69adfaa7e7 (diff) | |
| download | servo-e70dcc3ae55c743bab2aa4b35cbfd8dcf11f799a.tar.gz servo-e70dcc3ae55c743bab2aa4b35cbfd8dcf11f799a.zip | |
auto merge of #3476 : Ms2ger/servo/rm-hotfix, r=Ms2ger,metajack
This was added in anticipation of a wptrunner release that includes the change.
| -rwxr-xr-x | tests/wpt/run.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/wpt/run.sh b/tests/wpt/run.sh index c78f554ffa3..b10d8fddb96 100755 --- a/tests/wpt/run.sh +++ b/tests/wpt/run.sh @@ -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 \ |