auto merge of #5074 : acgtyrant/servo/patch-1, r=Manishearth

Fixes #5056
This commit is contained in:
bors-servo 2015-02-26 05:33:49 -07:00
commit 3fc2478c38

View file

@ -5,6 +5,11 @@
set -e set -e
wpt_root=$(dirname $0) wpt_root=$(dirname $0)
binary_dir=$wpt_root/../../components/servo/target
if [[ $1 == "--release" ]]; then
binary_dir=$binary_dir/release
shift
fi
PYTHON=$(which python2 2> /dev/null || echo python) PYTHON=$(which python2 2> /dev/null || echo python)
VIRTUALENV=$(which virtualenv2 2> /dev/null || echo virtualenv) VIRTUALENV=$(which virtualenv2 2> /dev/null || echo virtualenv)
@ -20,6 +25,6 @@ fi
python $wpt_root/run.py \ python $wpt_root/run.py \
--config $wpt_root/config.ini \ --config $wpt_root/config.ini \
--binary $wpt_root/../../components/servo/target/servo \ --binary $binary_dir/servo \
--log-mach - \ --log-mach - \
"$@" "$@"