Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-01 19:50:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix reftest build errors

Browse source
This commit is contained in:
Brian Anderson 2012-06-26 00:21:12 -07:00
parent f36a834f0d
commit 105cd0ac9a
1 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/reftest/reftest.rs
View file

@ -2,10 +2,11 @@ use std;
use servo; use servo;
import result::{ok, err}; import result::{ok, err};
import std::test{test_opts, run_tests_console, test_desc}; import std::test::{test_opts, run_tests_console, test_desc};
import std::getopts::{getopts, reqopt, opt_opt, fail_str}; import std::getopts::{getopts, reqopt, opt_str, fail_str};
import std::path::connect; import path::{connect, basename};
import os::list_dir_path; import os::list_dir_path;
import servo::run_pipeline_png;
fn main(args: [str]) { fn main(args: [str]) {
let config = parse_config(args); let config = parse_config(args);
@ -17,7 +18,8 @@ fn main(args: [str]) {
type Config = { type Config = {
source_dir: str, source_dir: str,
work_dir: str work_dir: str,
filter: option<str>
}; };
fn parse_config(args: [str]) -> Config { fn parse_config(args: [str]) -> Config {
@ -26,7 +28,7 @@ fn parse_config(args: [str]) -> Config {
let match = alt getopts(args, opts) { let match = alt getopts(args, opts) {
ok(m) { m } ok(m) { m }
err(f) { fail fail_str(f) } err(f) { fail fail_str(f) }
} };
{ {
source_dir: opt_str(match, "source-dir"), source_dir: opt_str(match, "source-dir"),
@ -34,14 +36,14 @@ fn parse_config(args: [str]) -> Config {
filter: if match.free.is_empty() { filter: if match.free.is_empty() {
none none
} else { } else {
some(match.head()) some(match.free.head())
} }
} }
} }
fn test_options(config: Config) -> test_opts { fn test_options(config: Config) -> test_opts {
{ {
filter: none, filter: config.filter,
run_ignored: false, run_ignored: false,
logfile: none logfile: none
} }
@ -55,7 +57,7 @@ fn find_tests(config: Config) -> [test_desc] {
fn make_test(config: Config, file: str) -> test_desc { fn make_test(config: Config, file: str) -> test_desc {
{ {
name: file, name: file,
fn: { || run_test(config, file) }, fn: fn~() { run_test(config, file) },
ignore: false, ignore: false,
should_fail: false should_fail: false
} }
@ -64,7 +66,7 @@ fn make_test(config: Config, file: str) -> test_desc {
fn run_test(config: Config, file: str) { fn run_test(config: Config, file: str) {
let servo_render = render_servo(config, file); let servo_render = render_servo(config, file);
let ref_render = render_ref(config, file); let ref_render = render_ref(config, file);
if !servo_render.eq(ref_render) { if servo_render != ref_render {
fail; fail;
} }
} }
@ -72,8 +74,8 @@ fn run_test(config: Config, file: str) {
type Render = [u8]; type Render = [u8];
fn render_servo(config: Config, file: str) -> Render { fn render_servo(config: Config, file: str) -> Render {
let infile = connect(config.work_dir, file); let infile = file;
let outfile = infile + ".png"; let outfile = connect(config.work_dir, basename(file) + ".png");
run_pipeline_png(infile, outfile); run_pipeline_png(infile, outfile);
fail; fail;
} }
@ -82,7 +84,7 @@ fn render_ref(config: Config, file: str) -> Render {
fail fail
} }
fn install_rasterize_js() { fail } fn install_rasterize_js() { }
// This is the script that uses phantom.js to render pages // This is the script that uses phantom.js to render pages
fn rasterize_js() -> str { #include_str("rasterize.js") } fn rasterize_js() -> str { #include_str("rasterize.js") }