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

auto merge of #610 : metajack/servo/fix-reftest, r=pcwalton

Browse source 
This adds a sha1 hash to the output filenames based on the test. Rust runs
tests in parallel by default, so the test files were stomping on each other.
This commit is contained in:
bors-servo 2013-07-19 21:36:23 -07:00
commit ddbe1c9c41
1 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -110,20 +110,30 @@ fn make_test(reftest: Reftest) -> TestDescAndFn {
}
fn check_reftest(reftest: Reftest) {
let id = gen_id(&reftest);
let left_filename = fmt!("/tmp/%s-left.png", id);
let right_filename = fmt!("/tmp/%s-right.png", id);
let left_path = Path(left_filename);
let right_path = Path(right_filename);
let options = run::ProcessOptions::new();
let args = ~[~"-o", ~"/tmp/reftest-left.png", reftest.left.clone()];
let args = ~[~"-o", left_filename.clone(), reftest.left.clone()];
let mut process = run::Process::new("./servo", args, options);
let _retval = process.finish();
// assert!(retval == 0);
let args = ~[~"-o", ~"/tmp/reftest-right.png", reftest.right.clone()];
let args = ~[~"-o", right_filename.clone(), reftest.right.clone()];
let mut process = run::Process::new("./servo", args, options);
let _retval = process.finish();
// assert!(retval == 0);
// check the pngs are bit equal
let left_sha = calc_hash(&Path("/tmp/reftest-left.png"));
let right_sha = calc_hash(&Path("/tmp/reftest-right.png"));
let left_sha = calc_hash(&left_path);
os::remove_file(&left_path);
let right_sha = calc_hash(&right_path);
os::remove_file(&right_path);
assert!(left_sha.is_some());
assert!(right_sha.is_some());
match reftest.kind {
@ -132,6 +142,17 @@ fn check_reftest(reftest: Reftest) {
}
}
fn gen_id(reftest: &Reftest) -> ~str {
let mut sha = Sha1::new();
match reftest.kind {
Same => sha.input_str("=="),
Different => sha.input_str("!="),
}
sha.input_str(reftest.left);
sha.input_str(reftest.right);
sha.result_str()
}
fn calc_hash(path: &Path) -> Option<~str> {
match io::file_reader(path) {
Err(*) => None,