Skip to content
Permalink
Browse files
[GTK] W3C CSS2.1 anonymous table tests are failing
https://bugs.webkit.org/show_bug.cgi?id=152455

Reviewed by Mario Sanchez Prada.

Tools:

Add shared-mime-info to the jhbuild environment, since it affects the results of layout
tests. Add upstream patches to fix detection of XHTML files.

* gtk/jhbuild.modules:
* gtk/patches/shared-mime-info-xht-glob.patch: Added.
* gtk/patches/shared-mime-info-xhtml-magic.patch: Added.

LayoutTests:

Unskip the anonymous table tests, so the bots can generate expected results. The expected
results will be committed separately.

* platform/gtk/TestExpectations:


Canonical link: https://commits.webkit.org/171051@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@194845 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Michael Catanzaro committed Jan 11, 2016
1 parent bfa6881 commit b9782c7f2cc8a21daf6937db2e159f858ed99d65
Showing 6 changed files with 88 additions and 71 deletions.
@@ -1,3 +1,15 @@
2016-01-11 Michael Catanzaro <mcatanzaro@igalia.com>

[GTK] W3C CSS2.1 anonymous table tests are failing
https://bugs.webkit.org/show_bug.cgi?id=152455

Reviewed by Mario Sanchez Prada.

Unskip the anonymous table tests, so the bots can generate expected results. The expected
results will be committed separately.

* platform/gtk/TestExpectations:

2016-01-10 Myles C. Maxfield <mmaxfield@apple.com>

[SVG -> OTF Converter] Parsing failures cause use of incomplete fonts
@@ -52,77 +52,6 @@ editing/pasteboard/gtk [ Pass ]
# Tests that require new results.
#////////////////////////////////////////////////////////////////////////////////////////

# These XHTML files are being processed as HTML files.
# Need to fix this before we can add expectations.
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-015.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-016.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-023.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-024.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-035.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-036.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-037.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-038.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-045.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-046.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-047.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-048.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-049.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-050.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-055.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-056.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-091.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-092.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-099.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-100.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-103.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-104.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-105.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-106.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-107.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-108.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-109.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-110.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-111.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-112.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-113.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-114.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-115.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-116.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-117.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-118.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-119.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-120.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-121.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-122.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-123.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-124.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-139.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-140.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-149.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-150.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-155.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-156.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-159.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-160.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-165.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-166.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-177.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-178.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-179.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-180.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-181.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-189.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-190.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-191.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-192.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-193.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-194.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-195.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-196.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-205.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-206.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-207.xht [ Missing ]
webkit.org/b/152455 css2.1/tables/table-anonymous-objects-208.xht [ Missing ]

#////////////////////////////////////////////////////////////////////////////////////////
# Expected failures
@@ -1,3 +1,17 @@
2016-01-11 Michael Catanzaro <mcatanzaro@igalia.com>

[GTK] W3C CSS2.1 anonymous table tests are failing
https://bugs.webkit.org/show_bug.cgi?id=152455

Reviewed by Mario Sanchez Prada.

Add shared-mime-info to the jhbuild environment, since it affects the results of layout
tests. Add upstream patches to fix detection of XHTML files.

* gtk/jhbuild.modules:
* gtk/patches/shared-mime-info-xht-glob.patch: Added.
* gtk/patches/shared-mime-info-xhtml-magic.patch: Added.

2016-01-10 Saam barati <sbarati@apple.com>

Implement a sampling profiler
@@ -29,6 +29,7 @@
<dep package="gst-libav"/>
<dep package="openwebrtc"/>
<dep package="llvm"/>
<dep package="shared-mime-info"/>
<if condition-set="linux">
<dep package="xserver"/>
<dep package="mesa"/>
@@ -480,6 +481,20 @@
hash="sha256:74fe9fdad510c8a6666febeceb7ebafc581ef990b3afcc8c1e8b5d90b24b3461">
</branch>
</autotools>

<autotools id="shared-mime-info"
autogenargs="--disable-default-make-check">
<dependencies>
<dep package="libxml2"/>
<dep package="glib"/>
</dependencies>
<branch module="/~hadess/shared-mime-info-${version}.tar.xz" version="1.5"
repo="freedesktop.org"
hash="sha256:d6412840eb265bf36e61fd7b6fc6bea21b0f58cb22bed16f2ccccdd54bea4180">
<patch file="shared-mime-info-xht-glob.patch" strip="1"/>
<patch file="shared-mime-info-xhtml-magic.patch" strip="1"/>
</branch>
</autotools>

<!-- Dependencies listed below this point are not thought to affect test results, and are only
included because they themselves depend on other dependencies built by jhbuild. -->
@@ -0,0 +1,21 @@
From 6e5818deb54fdfa70f5798fc1df1d5c3eaba42df Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 7 Jan 2016 15:48:47 +0100
Subject: Add *.xht as a glob for XHTML files


diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index dc12655..48696d9 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -3669,6 +3669,7 @@ command to generate the output files.
<sub-class-of type="application/xml"/>
<generic-icon name="text-html"/>
<glob pattern="*.xhtml"/>
+ <glob pattern="*.xht"/>
<root-XML namespaceURI='http://www.w3.org/1999/xhtml' localName='html'/>
</mime-type>
<mime-type type="application/zip">
--
cgit v0.10.2

@@ -0,0 +1,26 @@
From 4961dc3e48d13c0c675ad7c135419b864813ca55 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 7 Jan 2016 15:49:16 +0100
Subject: Add magic for XHTML files


diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 48696d9..9ea2f95 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -3670,6 +3670,12 @@ command to generate the output files.
<generic-icon name="text-html"/>
<glob pattern="*.xhtml"/>
<glob pattern="*.xht"/>
+ <magic priority="60">
+ <match type="string" value="//W3C//DTD XHTML " offset="0:256"/>
+ <match type="string" value="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" offset="0:256"/>
+ <match type="string" value="&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml" offset="0:256"/>
+ <match type="string" value="&lt;HTML xmlns=&quot;http://www.w3.org/1999/xhtml" offset="0:256"/>
+ </magic>
<root-XML namespaceURI='http://www.w3.org/1999/xhtml' localName='html'/>
</mime-type>
<mime-type type="application/zip">
--
cgit v0.10.2

0 comments on commit b9782c7

Please sign in to comment.