diff --git a/src/test/harness/reftest/reftest.rs b/src/test/harness/reftest/reftest.rs index 919130b76f0..be9bd308603 100644 --- a/src/test/harness/reftest/reftest.rs +++ b/src/test/harness/reftest/reftest.rs @@ -178,7 +178,7 @@ fn parse_lists(file: &str, servo_args: &[String], render_mode: RenderMode) -> Ve } let reftest = Reftest { - name: test_line.file_left.to_string().append(" / ").append(test_line.file_right), + name: format!("{} {} {}", test_line.file_left, test_line.kind, test_line.file_right), kind: kind, files: [file_left, file_right], id: next_id, diff --git a/src/test/html/acid2.html b/src/test/html/acid2.html index 411c4d7134a..b6432099e4d 100755 --- a/src/test/html/acid2.html +++ b/src/test/html/acid2.html @@ -1,4 +1,3 @@ - diff --git a/src/test/ref/acid2_noscroll.html b/src/test/ref/acid2_noscroll.html new file mode 100755 index 00000000000..5c6e6ff1112 --- /dev/null +++ b/src/test/ref/acid2_noscroll.html @@ -0,0 +1,152 @@ + + + + The Second Acid Test + + + + + + +
+

Standards compliant?

+

Take The Acid2 Test and compare it to the reference rendering.

+
+

Hello World!

+
+

+

+
                              
+
ERROR
+
+
+
+
 
+
+ +
+
+ + diff --git a/src/test/ref/acid2_ref.html b/src/test/ref/acid2_ref.html new file mode 100644 index 00000000000..a6cc0c01b28 --- /dev/null +++ b/src/test/ref/acid2_ref.html @@ -0,0 +1,17 @@ + + + + The Second Acid Test (Reference Rendering) + + + +

Hello World!

+

Follow this link to view the reference image, which should be rendered below the text "Hello World!" on the test page in the same way that this paragraph is rendered below that text on this page.

+ + diff --git a/src/test/ref/acid2_ref.png b/src/test/ref/acid2_ref.png new file mode 100644 index 00000000000..7aee7609d6a Binary files /dev/null and b/src/test/ref/acid2_ref.png differ diff --git a/src/test/ref/acid2_ref_broken.html b/src/test/ref/acid2_ref_broken.html new file mode 100644 index 00000000000..aecefd1ef02 --- /dev/null +++ b/src/test/ref/acid2_ref_broken.html @@ -0,0 +1,17 @@ + + + + The Second Acid Test (Reference Rendering) + + + +

Hello World!

+

Follow this link to view the reference image, which should be rendered below the text "Hello World!" on the test page in the same way that this paragraph is rendered below that text on this page.

+ + diff --git a/src/test/ref/acid2_ref_broken.png b/src/test/ref/acid2_ref_broken.png new file mode 100644 index 00000000000..91c803bdadc Binary files /dev/null and b/src/test/ref/acid2_ref_broken.png differ diff --git a/src/test/ref/basic.list b/src/test/ref/basic.list index 058e567068a..13835bf64ee 100644 --- a/src/test/ref/basic.list +++ b/src/test/ref/basic.list @@ -94,3 +94,11 @@ flaky_cpu == linebreak_simple_a.html linebreak_simple_b.html == block_replaced_content_a.html block_replaced_content_ref.html == block_replaced_content_b.html block_replaced_content_ref.html == root_margin_collapse_a.html root_margin_collapse_b.html + +# Should be == with expected failure: +!= ../html/acid2.html#top acid2_ref.html + +# Should be != with expected failure: +# FIXME: use the real test when pixel-snapping for scrolling is fixed. +#== ../html/acid2.html#top acid2_ref_broken.html +flaky_gpu,flaky_linux == acid2_noscroll.html acid2_ref_broken.html