From a7fcbd9d6035bfab183a0dabc38b053c2a080abf Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Sun, 26 Jan 2014 20:29:45 -0600 Subject: [PATCH 1/2] Disable 3 broken ref tests so that we can start blocking on check-ref again --- src/test/harness/reftest/reftest.rs | 1 + src/test/ref/basic.list | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/harness/reftest/reftest.rs b/src/test/harness/reftest/reftest.rs index cae85709304..edd50b1b6f1 100644 --- a/src/test/harness/reftest/reftest.rs +++ b/src/test/harness/reftest/reftest.rs @@ -81,6 +81,7 @@ fn parse_lists(filenames: &[~str]) -> ~[TestDescAndFn] { let kind = match parts[0] { "==" => Same, "!=" => Different, + "#" => continue, _ => fail!("reftest line: '{:s}' has invalid kind '{:s}'", line, parts[0]) }; diff --git a/src/test/ref/basic.list b/src/test/ref/basic.list index 37de5b3e00f..ac82e9dca56 100644 --- a/src/test/ref/basic.list +++ b/src/test/ref/basic.list @@ -12,13 +12,13 @@ == first_of_type_pseudo_a.html first_of_type_pseudo_b.html == last_of_type_pseudo_a.html last_of_type_pseudo_b.html == only_of_type_pseudo_a.html only_of_type_pseudo_b.html -== visibility_hidden.html visibility_hidden_ref.html +# visibility_hidden.html visibility_hidden_ref.html == root_height_a.html root_height_b.html == png_rgba_colorspace_a.html png_rgba_colorspace_b.html == border_style_none_a.html border_style_none_b.html == acid1_a.html acid1_b.html -== text_decoration_propagation_a.html text_decoration_propagation_b.html -== inline_text_align_a.html inline_text_align_b.html +# text_decoration_propagation_a.html text_decoration_propagation_b.html +# inline_text_align_a.html inline_text_align_b.html == font_size_em.html font_size_em_ref.html == font_size_percentage.html font_size_em_ref.html == position_fixed_a.html position_fixed_b.html From 9a74cadc02c9a393103a753d5e584eb3e7349a48 Mon Sep 17 00:00:00 2001 From: Lars Bergstrom Date: Sun, 26 Jan 2014 20:34:13 -0600 Subject: [PATCH 2/2] Enable ref tests on darwin --- mk/check.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/check.mk b/mk/check.mk index 895b1dbca22..69ba5d1f0e4 100644 --- a/mk/check.mk +++ b/mk/check.mk @@ -58,11 +58,11 @@ check-test: ifeq ($(CFG_OSTYPE),apple-darwin) .PHONY: check -check: $(DEPS_CHECK_TARGETS_FAST) check-servo check-content tidy +check: $(DEPS_CHECK_TARGETS_FAST) check-servo check-content check-ref tidy @$(call E, check: all) .PHONY: check-all -check-all: $(DEPS_CHECK_TARGETS_ALL) check-servo check-content tidy +check-all: $(DEPS_CHECK_TARGETS_ALL) check-servo check-content check-ref tidy @$(call E, check: all) else .PHONY: check