From e8da983aeb52bf697db0dcf02c8e548b2014f424 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 25 Sep 2014 10:46:31 +0200 Subject: [PATCH 1/2] Remove temporary wptrunner hotfix. This was added in anticipation of a wptrunner release that includes the change. --- tests/wpt/run.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/wpt/run.sh b/tests/wpt/run.sh index c78f554ffa3..4aa626730d7 100755 --- a/tests/wpt/run.sh +++ b/tests/wpt/run.sh @@ -18,10 +18,6 @@ if [[ $* == *--update-manifest* ]]; then 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 $servo_root/tests/wpt/run.py \ --config $servo_root/tests/wpt/config.ini \ --binary target/servo \ From 8dbe2b352b1e75b0457949fce5136a69adfaa7e7 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Mon, 29 Sep 2014 08:55:09 +0200 Subject: [PATCH 2/2] Update wptrunner to version 1.2. --- tests/wpt/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/wpt/run.sh b/tests/wpt/run.sh index 4aa626730d7..b10d8fddb96 100755 --- a/tests/wpt/run.sh +++ b/tests/wpt/run.sh @@ -16,7 +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' +(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 \