From 12d2539684db5de814f02a585f16c56728517811 Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 23 Apr 2014 17:04:34 +0100 Subject: [PATCH] Pass extra args through to wptrunner --- src/test/wpt/run.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) mode change 100644 => 100755 src/test/wpt/run.sh diff --git a/src/test/wpt/run.sh b/src/test/wpt/run.sh old mode 100644 new mode 100755 index 83406765aff..2174f6d34e7 --- a/src/test/wpt/run.sh +++ b/src/test/wpt/run.sh @@ -2,12 +2,16 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -cd $2/.. +servo_root="$1" +objdir="$2" +shift 2 +cd $objdir/.. test -d _virtualenv || virtualenv _virtualenv -test -d $1/src/test/wpt/metadata || mkdir -p $1/src/test/wpt/metadata -test -d $1/src/test/wpt/prefs || mkdir -p $1/src/test/wpt/prefs +test -d $servo_root/src/test/wpt/metadata || mkdir -p $servo_root/src/test/wpt/metadata +test -d $servo_root/src/test/wpt/prefs || mkdir -p $servo_root/src/test/wpt/prefs source _virtualenv/bin/activate (python -c "import html5lib" &>/dev/null) || pip install html5lib (python -c "import wptrunner" &>/dev/null) || pip install wptrunner -python $1/src/test/wpt/run.py --binary $2/../servo + +python $servo_root/src/test/wpt/run.py --binary $objdir/../servo "$@"