Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-24 09:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #1804 : kmcallister/servo/cpu-ref-test, r=metajack

Browse source 
Alternative to PR #1610.
This commit is contained in:
bors-servo 2014-03-04 12:34:47 -05:00
commit 60e438e03d
2 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mk/check.mk
View file

@ -81,8 +81,10 @@ check-servo: $(foreach lib_crate,$(SERVO_LIB_CRATES),check-servo-$(lib_crate)) s
.PHONY: check-ref .PHONY: check-ref
check-ref: reftest check-ref: reftest
@$(call E, check: reftests) @$(call E, check: reftests with GPU rendering)
$(Q)./reftest $(S)src/test/ref/*.list $(Q)./reftest $(S)src/test/ref/*.list
@$(call E, check: reftests with CPU rendering)
$(Q)./reftest $(S)src/test/ref/*.list -- -c
.PHONY: check-content .PHONY: check-content
check-content: contenttest check-content: contenttest

53
src/test/harness/reftest/reftest.rs
View file

@ -22,13 +22,16 @@ use extra::test::run_tests_console;
fn main() { fn main() {
let args = os::args(); let args = os::args();
if args.len() < 2 { let mut parts = args.tail().split(|e| "--" == e.as_slice());
println("error: at least one reftest list must be given");
os::set_exit_status(1); let files = parts.next().unwrap(); // .split() is never empty
return; let servo_args = parts.next().unwrap_or(&[]);
if files.len() == 0 {
fail!("error: at least one reftest list must be given");
} }
let tests = parse_lists(args.tail()); let tests = parse_lists(files, servo_args);
let test_opts = TestOpts { let test_opts = TestOpts {
filter: None, filter: None,
run_ignored: false, run_ignored: false,
@ -55,12 +58,12 @@ enum ReftestKind {
struct Reftest { struct Reftest {
name: ~str, name: ~str,
kind: ReftestKind, kind: ReftestKind,
left: ~str, files: [~str, ..2],
right: ~str,
id: uint, id: uint,
servo_args: ~[~str],
} }
fn parse_lists(filenames: &[~str]) -> ~[TestDescAndFn] { fn parse_lists(filenames: &[~str], servo_args: &[~str]) -> ~[TestDescAndFn] {
let mut tests: ~[TestDescAndFn] = ~[]; let mut tests: ~[TestDescAndFn] = ~[];
let mut next_id = 0; let mut next_id = 0;
for file in filenames.iter() { for file in filenames.iter() {
@ -96,9 +99,9 @@ fn parse_lists(filenames: &[~str]) -> ~[TestDescAndFn] {
let reftest = Reftest { let reftest = Reftest {
name: parts[1] + " / " + parts[2], name: parts[1] + " / " + parts[2],
kind: kind, kind: kind,
left: file_left, files: [file_left, file_right],
right: file_right,
id: next_id, id: next_id,
servo_args: servo_args.to_owned(),
}; };
next_id += 1; next_id += 1;
@ -123,23 +126,21 @@ fn make_test(reftest: Reftest) -> TestDescAndFn {
} }
} }
fn capture(reftest: &Reftest, side: uint) -> png::Image {
let filename = format!("/tmp/servo-reftest-{:06u}-{:u}.png", reftest.id, side);
let mut args = reftest.servo_args.clone();
args.push_all_move(~[~"-f", ~"-o", filename.clone(), reftest.files[side].clone()]);
let mut process = Process::new("./servo", args, ProcessOptions::new()).unwrap();
let retval = process.finish();
assert!(retval == ExitStatus(0));
png::load_png(&from_str::<Path>(filename).unwrap()).unwrap()
}
fn check_reftest(reftest: Reftest) { fn check_reftest(reftest: Reftest) {
let left_filename = format!("/tmp/servo-reftest-{:06u}-left.png", reftest.id); let left = capture(&reftest, 0);
let right_filename = format!("/tmp/servo-reftest-{:06u}-right.png", reftest.id); let right = capture(&reftest, 1);
let args = ~[~"-f", ~"-o", left_filename.clone(), reftest.left.clone()];
let mut process = Process::new("./servo", args, ProcessOptions::new()).unwrap();
let retval = process.finish();
assert!(retval == ExitStatus(0));
let args = ~[~"-f", ~"-o", right_filename.clone(), reftest.right.clone()];
let mut process = Process::new("./servo", args, ProcessOptions::new()).unwrap();
let retval = process.finish();
assert!(retval == ExitStatus(0));
// check the pngs are bit equal
let left = png::load_png(&from_str::<Path>(left_filename).unwrap()).unwrap();
let right = png::load_png(&from_str::<Path>(right_filename).unwrap()).unwrap();
let pixels: ~[u8] = left.pixels.iter().zip(right.pixels.iter()).map(|(&a, &b)| { let pixels: ~[u8] = left.pixels.iter().zip(right.pixels.iter()).map(|(&a, &b)| {
if (a as i8 - b as i8 == 0) { if (a as i8 - b as i8 == 0) {