From 5f3c2215aeaa72b439832cbb779b12df7d5f0000 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 20 Aug 2012 16:20:32 -0700 Subject: [PATCH] Un-ignore some tests --- src/servo/layout/display_list_builder.rs | 6 ++---- src/servo/layout/text.rs | 2 +- src/servo/text/text_run.rs | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/servo/layout/display_list_builder.rs b/src/servo/layout/display_list_builder.rs index 6dcc6a3fbb6..c482edd3c3f 100644 --- a/src/servo/layout/display_list_builder.rs +++ b/src/servo/layout/display_list_builder.rs @@ -108,7 +108,6 @@ fn box_to_display_items(list: dl::display_list, box: @Box, origin: Point2D) fn should_convert_text_boxes_to_solid_color_background_items() { #[test]; - #[ignore(reason = "crashy")]; let s = Scope(); let n = s.new_node(Text(~"firecracker")); @@ -129,7 +128,6 @@ fn should_convert_text_boxes_to_solid_color_background_items() { fn should_convert_text_boxes_to_text_items() { #[test]; - #[ignore(reason = "crashy")]; let s = Scope(); let n = s.new_node(Text(~"firecracker")); @@ -149,7 +147,7 @@ fn should_convert_text_boxes_to_text_items() { fn should_calculate_the_bounds_of_the_text_box_background_color() { #[test]; - #[ignore]; + #[ignore(cfg(target_os = "macos"))]; let s = Scope(); let n = s.new_node(Text(~"firecracker")); @@ -171,7 +169,7 @@ fn should_calculate_the_bounds_of_the_text_box_background_color() { fn should_calculate_the_bounds_of_the_text_items() { #[test]; - #[ignore]; + #[ignore(cfg(target_os = "macos"))]; let s = Scope(); let n = s.new_node(Text(~"firecracker")); diff --git a/src/servo/layout/text.rs b/src/servo/layout/text.rs index 5e0616d6dd0..96faef9c82b 100644 --- a/src/servo/layout/text.rs +++ b/src/servo/layout/text.rs @@ -39,7 +39,7 @@ impl @Box : TextLayout { fn should_calculate_the_size_of_the_text_box() { #[test]; - #[ignore]; + #[ignore(cfg(target_os = "macos"))]; import dom::rcu::{Scope}; import dom::base::{Text, NodeScope}; diff --git a/src/servo/text/text_run.rs b/src/servo/text/text_run.rs index 30a2b81466b..a8513035fc1 100644 --- a/src/servo/text/text_run.rs +++ b/src/servo/text/text_run.rs @@ -30,7 +30,7 @@ struct TextRun { fn should_calculate_the_total_size() { #[test]; - #[ignore(reason = "random failures")]; + #[ignore(cfg(target_os = "macos"))]; let flib = FontLibrary(); let font = flib.get_test_font();