Merge pull request servo#10 from kmcallister/otest

SimonSapin · SimonSapin · commit 77921ee3f243 · 2013-08-16T15:05:07.000-07:00
Test fixes
diff --git a/Makefile.in b/Makefile.in
@@ -18,7 +18,7 @@ libcssparser.dummy: cssparser.rc $(RUST_SRC)
 	touch $@
 
 cssparser-test: cssparser.rc $(RUST_SRC)
-	$(RUSTC) $(RUSTFLAGS) $< --out-dir . --test
+	$(RUSTC) $(RUSTFLAGS) $< -o $@ --test
 
 .PHONY: check
 check: cssparser-test
diff --git a/tests.rs b/tests.rs
@@ -132,7 +132,7 @@ fn one_rule() {
 fn run_color_tests(json_data: &str, to_json: &fn(result: Option<Color>) -> json::Json) {
     do run_json_tests(json_data) |input| {
         match parse_one_component_value(tokenize(input)) {
-            Ok(component_value) => to_json(parse_color(&component_value)),
+            Ok(component_value) => to_json(Color::parse(&component_value)),
             Err(_reason) => json::Null,
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ fn one_rule() {`
`132`	`132`	`fn run_color_tests(json_data: &str, to_json: &fn(result: Option<Color>) -> json::Json) {`
`133`	`133`	`do run_json_tests(json_data) \|input\| {`
`134`	`134`	`match parse_one_component_value(tokenize(input)) {`
`135`		`- Ok(component_value) => to_json(parse_color(&component_value)),`
	`135`	`+ Ok(component_value) => to_json(Color::parse(&component_value)),`
`136`	`136`	`Err(_reason) => json::Null,`
`137`	`137`	`}`
`138`	`138`	`}`