mirror of
https://github.com/servo/servo.git
synced 2025-08-07 06:25:32 +01:00
Move the servo crate from root to components/servo
This commit is contained in:
parent
b2b6d4d0d1
commit
2f413c8937
15 changed files with 55 additions and 45 deletions
|
@ -99,7 +99,7 @@ fn run_test(file: String) {
|
|||
let stderr = InheritFd(2);
|
||||
let args = ["-z", "-f", infile.as_slice()];
|
||||
|
||||
let mut prc = match Command::new("target/servo")
|
||||
let mut prc = match Command::new("components/servo/target/servo")
|
||||
.args(args)
|
||||
.stdin(Ignored)
|
||||
.stdout(stdout)
|
||||
|
|
|
@ -248,7 +248,7 @@ fn make_test(reftest: Reftest) -> TestDescAndFn {
|
|||
|
||||
fn capture(reftest: &Reftest, side: uint) -> (u32, u32, Vec<u8>) {
|
||||
let png_filename = format!("/tmp/servo-reftest-{:06u}-{:u}.png", reftest.id, side);
|
||||
let mut command = Command::new("target/servo");
|
||||
let mut command = Command::new("components/servo/target/servo");
|
||||
command
|
||||
.args(reftest.servo_args.as_slice())
|
||||
// Allows pixel perfect rendering of Ahem font for reftests.
|
||||
|
|
|
@ -4,22 +4,22 @@
|
|||
|
||||
set -e
|
||||
|
||||
servo_root=$(pwd)
|
||||
wpt_root=$(dirname $0)
|
||||
|
||||
PYTHON=$(which python2 2> /dev/null || echo python)
|
||||
VIRTUALENV=$(which virtualenv2 2> /dev/null || echo virtualenv)
|
||||
|
||||
test -d _virtualenv || $VIRTUALENV _virtualenv -p $PYTHON
|
||||
test -d $servo_root/tests/wpt/metadata || mkdir -p $servo_root/tests/wpt/metadata
|
||||
test -d $servo_root/tests/wpt/prefs || mkdir -p $servo_root/tests/wpt/prefs
|
||||
source _virtualenv/bin/activate
|
||||
test -d $wpt_root/_virtualenv || $VIRTUALENV $wpt_root/_virtualenv -p $PYTHON
|
||||
test -d $wpt_root/metadata || mkdir -p $wpt_root/metadata
|
||||
test -d $wpt_root/prefs || mkdir -p $wpt_root/prefs
|
||||
source $wpt_root/_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.7'
|
||||
|
||||
python $servo_root/tests/wpt/run.py \
|
||||
--config $servo_root/tests/wpt/config.ini \
|
||||
--binary target/servo \
|
||||
python $wpt_root/run.py \
|
||||
--config $wpt_root/config.ini \
|
||||
--binary $wpt_root/../../components/servo/target/servo \
|
||||
--log-mach - \
|
||||
"$@"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue