Changeset 150204 in webkit


Ignore:
Timestamp:
May 16, 2013 1:23:09 PM (11 years ago)
Author:
kov@webkit.org
Message:

[GTK] Build Xvfb with jhbuild
​https://bugs.webkit.org/show_bug.cgi?id=115907

Patch by Gustavo Noronha Silva <​gustavo.noronha@collabora.com> on 2013-05-16
Reviewed by Martin Robinson.

Tools:

Build our own Xvfb so that we can avoid problems with the system Xvfb
relying on symbols not present in our jhbuilt libraries such as pixman,
and also to ensure we have the fix for a GLX module crasher.

  • DumpRenderTree/gtk/DumpRenderTree.cpp:

(resetDefaultsToConsistentValues): enable accelerated compositing.

  • gtk/install-dependencies: list packages required for building Xvfb.
  • gtk/jhbuild.modules: add xserver as a jhbuild module.
  • gtk/patches/xserver-remove-bogus-dependencies.patch: Added.
  • gtk/patches/xserver-fix-glx-init.patch: Added. Fixes a crash while

initializing the GLX module for Xvfb.

LayoutTests:

Unskip and create baselines for transforms/3d and some webgl tests. We can unskip
more, but I prefer to only dip the toe in the waters first, to see how the bots
react.

  • platform/gtk/TestExpectations:
  • platform/gtk/transforms/3d/general/perspective-non-layer-expected.txt: Added.
  • platform/gtk/transforms/3d/general/perspective-units-expected.txt: Added.
  • platform/gtk/transforms/3d/hit-testing/backface-hit-test-expected.txt: Added.
  • platform/gtk/transforms/3d/hit-testing/backface-no-transform-hit-test-expected.txt: Added.
  • platform/gtk/transforms/3d/point-mapping/3d-point-mapping-2-expected.txt: Added.
  • platform/gtk/transforms/3d/point-mapping/3d-point-mapping-3-expected.txt: Added.
  • platform/gtk/transforms/3d/point-mapping/3d-point-mapping-coplanar-expected.txt: Added.
  • platform/gtk/transforms/3d/point-mapping/3d-point-mapping-deep-expected.txt: Added.
  • platform/gtk/transforms/3d/point-mapping/3d-point-mapping-expected.txt: Added.
  • platform/gtk/transforms/3d/point-mapping/3d-point-mapping-origins-expected.txt: Added.
  • platform/gtk/transforms/3d/point-mapping/3d-point-mapping-overlapping-expected.txt: Added.
  • platform/gtk/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.txt: Added.
Location:
trunk
Files:
18 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r150201 r150204  
     12013-05-16  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
     2
     3        [GTK] Build Xvfb with jhbuild
     4        https://bugs.webkit.org/show_bug.cgi?id=115907
     5
     6        Reviewed by Martin Robinson.
     7
     8        Unskip and create baselines for transforms/3d and some webgl tests. We can unskip
     9        more, but I prefer to only dip the toe in the waters first, to see how the bots
     10        react.
     11
     12        * platform/gtk/TestExpectations:
     13        * platform/gtk/transforms/3d/general/perspective-non-layer-expected.txt: Added.
     14        * platform/gtk/transforms/3d/general/perspective-units-expected.txt: Added.
     15        * platform/gtk/transforms/3d/hit-testing/backface-hit-test-expected.txt: Added.
     16        * platform/gtk/transforms/3d/hit-testing/backface-no-transform-hit-test-expected.txt: Added.
     17        * platform/gtk/transforms/3d/point-mapping/3d-point-mapping-2-expected.txt: Added.
     18        * platform/gtk/transforms/3d/point-mapping/3d-point-mapping-3-expected.txt: Added.
     19        * platform/gtk/transforms/3d/point-mapping/3d-point-mapping-coplanar-expected.txt: Added.
     20        * platform/gtk/transforms/3d/point-mapping/3d-point-mapping-deep-expected.txt: Added.
     21        * platform/gtk/transforms/3d/point-mapping/3d-point-mapping-expected.txt: Added.
     22        * platform/gtk/transforms/3d/point-mapping/3d-point-mapping-origins-expected.txt: Added.
     23        * platform/gtk/transforms/3d/point-mapping/3d-point-mapping-overlapping-expected.txt: Added.
     24        * platform/gtk/transforms/3d/point-mapping/3d-point-mapping-preserve-3d-expected.txt: Added.
     25
    1262013-05-16  Ryosuke Niwa  <rniwa@webkit.org>
    227

  • trunk/LayoutTests/platform/gtk/TestExpectations

    r150113 r150204  
    272272webkit.org/b/71849 inspector/profiler/webgl [ Skip ]
    273273webkit.org/b/71849 webkit.org/b/111477 inspector-protocol/layers [ Skip ]
    274 webkit.org/b/71849 transforms/3d [ Skip ]
    275 webkit.org/b/71849 webgl [ Skip ]
     274
     275Bug(GTK) webgl/conformance/attribs/gl-vertex-attrib-render.html [ Failure ]
     276Bug(GTK) webgl/conformance/context/context-creation-and-destruction.html [ Timeout ]
     277Bug(GTK) webgl/conformance/context/context-release-upon-reload.html [ Timeout Pass ]
     278Bug(GTK) webgl/conformance/context/context-release-with-workers.html [ Timeout Pass ]
     279Bug(GTK) webgl/conformance/context/premultiplyalpha-test.html [ Failure ]
     280Bug(GTK) webgl/conformance/extensions/oes-element-index-uint.html [ Failure ]
     281Bug(GTK) webgl/conformance/extensions/oes-texture-float-with-canvas.html [ Timeout Pass ]
     282Bug(GTK) webgl/conformance/extensions/oes-texture-float-with-video.html [ Timeout ]
     283Bug(GTK) webgl/conformance/extensions/oes-texture-float.html [ Failure ]
     284Bug(GTK) webgl/conformance/extensions/oes-vertex-array-object.html [ Crash Pass ]
     285Bug(GTK) webgl/conformance/glsl/functions/glsl-function-sin.html [ Failure ]
     286Bug(GTK) webgl/conformance/glsl/functions/glsl-function-smoothstep-float.html [ Failure ]
     287Bug(GTK) webgl/conformance/glsl/literals/float_literal.vert.html [ Failure ]
     288Bug(GTK) webgl/conformance/glsl/misc/shader-uniform-packing-restrictions.html [ Timeout ]
     289Bug(GTK) webgl/conformance/glsl/misc/shader-varying-packing-restrictions.html [ Failure ]
     290Bug(GTK) webgl/conformance/glsl/misc/shader-with-global-variable-precision-mismatch.html [ Failure ]
     291Bug(GTK) webgl/conformance/glsl/misc/shader-with-non-reserved-words.html [ Timeout ]
     292Bug(GTK) webgl/conformance/glsl/misc/shaders-with-varyings.html [ Failure ]
     293Bug(GTK) webgl/conformance/misc/type-conversion-test.html [ Crash ]
     294Bug(GTK) webgl/conformance/more/functions/readPixelsBadArgs.html [ Failure ]
     295Bug(GTK) webgl/conformance/more/functions/texImage2DHTML.html [ Failure ]
     296Bug(GTK) webgl/conformance/more/functions/texSubImage2DHTML.html [ Failure ]
     297Bug(GTK) webgl/conformance/more/functions/uniformfArrayLen1.html [ Failure ]
     298Bug(GTK) webgl/conformance/ogles/GL/atan/atan_001_to_008.html [ Timeout Pass ]
     299Bug(GTK) webgl/conformance/ogles/GL/atan/atan_009_to_012.html [ Timeout Pass ]
     300Bug(GTK) webgl/conformance/ogles/GL/equal/equal_001_to_008.html [ Timeout Pass ]
     301Bug(GTK) webgl/conformance/ogles/GL/exp2/exp2_001_to_008.html [ Timeout Pass ]
     302Bug(GTK) webgl/conformance/ogles/GL/functions/functions_065_to_072.html [ Timeout Pass ]
     303Bug(GTK) webgl/conformance/ogles/GL/functions/functions_073_to_080.html [ Timeout Pass ]
     304Bug(GTK) webgl/conformance/ogles/GL/greaterThan/greaterThan_001_to_008.html [ Timeout Pass ]
     305Bug(GTK) webgl/conformance/ogles/GL/lessThanEqual/lessThanEqual_001_to_008.html [ Timeout Pass ]
     306Bug(GTK) webgl/conformance/ogles/GL/log/log_001_to_008.html [ Timeout Pass ]
     307Bug(GTK) webgl/conformance/ogles/GL/log/log_009_to_012.html [ Timeout Pass ]
     308Bug(GTK) webgl/conformance/ogles/GL/log2/log2_001_to_008.html [ Timeout Pass ]
     309Bug(GTK) webgl/conformance/ogles/GL/mat/mat_001_to_008.html [ Timeout Pass ]
     310Bug(GTK) webgl/conformance/ogles/GL/mat/mat_009_to_016.html [ Timeout Pass ]
     311Bug(GTK) webgl/conformance/ogles/GL/mat/mat_017_to_024.html [ Timeout Pass ]
     312Bug(GTK) webgl/conformance/ogles/GL/mat/mat_025_to_032.html [ Timeout Pass ]
     313Bug(GTK) webgl/conformance/ogles/GL/mat/mat_033_to_040.html [ Timeout Pass ]
     314Bug(GTK) webgl/conformance/ogles/GL/max/max_001_to_006.html [ Timeout Pass ]
     315Bug(GTK) webgl/conformance/ogles/GL/mod/mod_001_to_008.html [ Timeout Pass ]
     316Bug(GTK) webgl/conformance/ogles/GL/notEqual/notEqual_001_to_008.html [ Timeout Pass ]
     317Bug(GTK) webgl/conformance/ogles/GL/operators/operators_001_to_008.html [ Timeout Pass ]
     318Bug(GTK) webgl/conformance/ogles/GL/operators/operators_009_to_016.html [ Timeout Pass ]
     319Bug(GTK) webgl/conformance/ogles/GL/operators/operators_017_to_024.html [ Timeout Pass ]
     320Bug(GTK) webgl/conformance/ogles/GL/pow/pow_001_to_008.html [ Timeout Pass ]
     321Bug(GTK) webgl/conformance/ogles/GL/pow/pow_009_to_016.html [ Timeout Pass ]
     322Bug(GTK) webgl/conformance/ogles/GL/pow/pow_017_to_024.html [ Timeout Pass ]
     323Bug(GTK) webgl/conformance/ogles/GL/sin/sin_001_to_006.html [ Timeout Failure ]
     324Bug(GTK) webgl/conformance/ogles/GL/struct/struct_001_to_008.html [ Timeout Pass ]
     325Bug(GTK) webgl/conformance/ogles/GL/struct/struct_009_to_016.html [ Timeout Pass ]
     326Bug(GTK) webgl/conformance/ogles/GL/struct/struct_017_to_024.html [ Timeout Pass ]
     327Bug(GTK) webgl/conformance/ogles/GL/swizzlers/swizzlers_009_to_016.html [ Timeout Pass ]
     328Bug(GTK) webgl/conformance/ogles/GL/swizzlers/swizzlers_017_to_024.html [ Timeout Pass ]
     329Bug(GTK) webgl/conformance/ogles/GL/tan/tan_001_to_006.html [ Timeout Pass ]
     330Bug(GTK) webgl/conformance/ogles/GL/vec/vec_009_to_016.html [ Timeout Pass ]
     331Bug(GTK) webgl/conformance/ogles/GL/vec3/vec3_001_to_008.html [ Failure ]
     332Bug(GTK) webgl/conformance/programs/gl-bind-attrib-location-long-names-test.html [ Failure ]
     333Bug(GTK) webgl/conformance/programs/program-test.html [ Failure ]
     334Bug(GTK) webgl/conformance/reading/read-pixels-test.html [ Timeout ]
     335Bug(GTK) webgl/conformance/renderbuffers/framebuffer-object-attachment.html [ Failure ]
     336Bug(GTK) webgl/conformance/rendering/multisample-corruption.html [ Timeout ]
     337Bug(GTK) webgl/conformance/rendering/point-size.html [ Failure ]
     338Bug(GTK) webgl/conformance/textures/copy-tex-image-2d-formats.html [ Failure ]
     339Bug(GTK) webgl/conformance/textures/origin-clean-conformance.html [ Skip ]
     340Bug(GTK) webgl/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgb565.html [ Timeout Pass ]
     341Bug(GTK) webgl/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgba4444.html [ Timeout Pass ]
     342Bug(GTK) webgl/conformance/textures/tex-image-and-sub-image-2d-with-canvas-rgba5551.html [ Timeout Pass ]
     343Bug(GTK) webgl/conformance/textures/tex-image-and-sub-image-2d-with-video-rgb565.html [ Timeout Pass ]
     344Bug(GTK) webgl/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba4444.html [ Timeout Pass ]
     345Bug(GTK) webgl/conformance/textures/tex-image-and-sub-image-2d-with-video-rgba5551.html [ Timeout Pass ]
     346Bug(GTK) webgl/conformance/textures/tex-image-and-sub-image-2d-with-video.html [ Timeout ]
     347Bug(GTK) webgl/conformance/textures/texture-attachment-formats.html [ Failure ]
     348Bug(GTK) webgl/conformance/textures/texture-size-cube-maps.html [ Failure ]
     349Bug(GTK) webgl/conformance/textures/texture-size-limit.html [ Timeout Pass ]
     350Bug(GTK) webgl/conformance/uniforms/gl-uniform-arrays.html [ Timeout ]
     351Bug(GTK) webgl/conformance/uniforms/uniform-default-values.html [ Timeout ]
    276352
    277353# LAYER_TREE_INCLUDES_VISIBLE_RECTS option to layerTreeAsText is only applicable to Mac.

  • trunk/Tools/ChangeLog

    r150198 r150204  
     12013-05-16  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
     2
     3        [GTK] Build Xvfb with jhbuild
     4        https://bugs.webkit.org/show_bug.cgi?id=115907
     5
     6        Reviewed by Martin Robinson.
     7
     8        Build our own Xvfb so that we can avoid problems with the system Xvfb
     9        relying on symbols not present in our jhbuilt libraries such as pixman,
     10        and also to ensure we have the fix for a GLX module crasher.
     11
     12        * DumpRenderTree/gtk/DumpRenderTree.cpp:
     13        (resetDefaultsToConsistentValues): enable accelerated compositing.
     14        * gtk/install-dependencies: list packages required for building Xvfb.
     15        * gtk/jhbuild.modules: add xserver as a jhbuild module.
     16        * gtk/patches/xserver-remove-bogus-dependencies.patch: Added.
     17        * gtk/patches/xserver-fix-glx-init.patch: Added. Fixes a crash while
     18        initializing the GLX module for Xvfb.
     19
    1202013-05-16  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
    221

  • trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp

    r149087 r150204  
    440440    GOwnPtr<gchar> localStoragePath(g_build_filename(g_get_user_data_dir(), "DumpRenderTreeGtk", "databases", NULL));
    441441    g_object_set(G_OBJECT(settings),
    442                  "enable-private-browsing", FALSE,
    443                  "enable-developer-extras", FALSE,
    444                  "enable-spell-checking", TRUE,
    445                  "enable-html5-database", TRUE,
    446                  "enable-html5-local-storage", TRUE,
    447                  "html5-local-storage-database-path", localStoragePath.get(),
    448                  "enable-xss-auditor", FALSE,
    449                  "enable-spatial-navigation", FALSE,
    450                  "javascript-can-access-clipboard", TRUE,
    451                  "javascript-can-open-windows-automatically", TRUE,
    452                  "enable-offline-web-application-cache", TRUE,
    453                  "enable-universal-access-from-file-uris", TRUE,
    454                  "enable-file-access-from-file-uris", TRUE,
    455                  "enable-scripts", TRUE,
    456                  "enable-dom-paste", TRUE,
    457                  "default-font-family", "Times",
    458                  "monospace-font-family", "Courier",
    459                  "serif-font-family", "Times",
    460                  "sans-serif-font-family", "Helvetica",
    461                  "cursive-font-family", "cursive",
    462                  "fantasy-font-family", "fantasy",
    463                  "default-font-size", 12,
    464                  "default-monospace-font-size", 10,
    465                  "minimum-font-size", 0,
    466                  "enable-caret-browsing", FALSE,
    467                  "enable-page-cache", FALSE,
    468                  "auto-resize-window", TRUE,
    469                  "auto-load-images", TRUE,
    470                  "enable-java-applet", FALSE,
    471                  "enable-plugins", TRUE,
    472                  "enable-hyperlink-auditing", FALSE,
    473                  "editing-behavior", WEBKIT_EDITING_BEHAVIOR_UNIX,
    474                  "enable-fullscreen", TRUE,
    475                  NULL);
     442        "enable-accelerated-compositing", TRUE,
     443        "enable-private-browsing", FALSE,
     444        "enable-developer-extras", FALSE,
     445        "enable-spell-checking", TRUE,
     446        "enable-html5-database", TRUE,
     447        "enable-html5-local-storage", TRUE,
     448        "html5-local-storage-database-path", localStoragePath.get(),
     449        "enable-xss-auditor", FALSE,
     450        "enable-spatial-navigation", FALSE,
     451        "javascript-can-access-clipboard", TRUE,
     452        "javascript-can-open-windows-automatically", TRUE,
     453        "enable-offline-web-application-cache", TRUE,
     454        "enable-universal-access-from-file-uris", TRUE,
     455        "enable-file-access-from-file-uris", TRUE,
     456        "enable-scripts", TRUE,
     457        "enable-dom-paste", TRUE,
     458        "default-font-family", "Times",
     459        "monospace-font-family", "Courier",
     460        "serif-font-family", "Times",
     461        "sans-serif-font-family", "Helvetica",
     462        "cursive-font-family", "cursive",
     463        "fantasy-font-family", "fantasy",
     464        "default-font-size", 12,
     465        "default-monospace-font-size", 10,
     466        "minimum-font-size", 0,
     467        "enable-caret-browsing", FALSE,
     468        "enable-page-cache", FALSE,
     469        "auto-resize-window", TRUE,
     470        "auto-load-images", TRUE,
     471        "enable-java-applet", FALSE,
     472        "enable-plugins", TRUE,
     473        "enable-hyperlink-auditing", FALSE,
     474        "editing-behavior", WEBKIT_EDITING_BEHAVIOR_UNIX,
     475        "enable-fullscreen", TRUE,
     476        NULL);
    476477    webkit_web_view_set_settings(webView, settings);
    477478    webkit_set_cache_model(WEBKIT_CACHE_MODEL_DOCUMENT_BROWSER);

  • trunk/Tools/gtk/install-dependencies

    r149109 r150204  
    8787        pulseaudio-utils \
    8888        python-gi \
    89         ruby \
    90         xvfb
     89        ruby
    9190
    9291    # These are dependencies necessary for building the jhbuild.
    … …  
    10099        libtiff4-dev \
    101100        libcroco3-dev \
    102         ragel
     101        ragel \
     102        xutils-dev \
     103        xtrans-dev \
     104        libxfont-dev \
     105        libpciaccess-dev \
     106        x11proto-gl-dev \
     107        x11proto-input-dev \
     108        x11proto-video-dev \
     109        x11proto-scrnsaver-dev \
     110        x11proto-resource-dev \
     111        x11proto-xf86dri-dev \
     112        libxkbfile-dev
    103113}
    104114
    … …  
    152162        pulseaudio-utils \
    153163        pygobject3-base \
    154         ruby \
    155         xorg-x11-server-Xvfb
     164        ruby
    156165
    157166    # These are dependencies necessary for building the jhbuild.
    … …  
    165174        libcroco-devel \
    166175        mesa-libEGL-devel \
    167         ragel
     176        ragel \
     177        xorg-x11-util-macros \
     178        xorg-x11-xtrans-devel \
     179        xorg-x11-proto-devel \
     180        libXfont-devel \
     181        libxkbfile-devel \
     182        libpciaccess-devel
    168183}
    169184

  • trunk/Tools/gtk/jhbuild.modules

    r149883 r150204  
    2929      <dep package="gst-plugins-bad"/>
    3030      <dep package="gst-libav"/>
     31      <dep package="xserver"/>
    3132    </dependencies>
    3233  </metamodule>
    … …  
    4849  <repository type="tarball" name="freedesktop.org"
    4950      href="http://www.freedesktop.org"/>
     51  <repository type="tarball" name="xorg"
     52      href="http://xorg.freedesktop.org"/>
    5053  <repository type="tarball" name="xmlsoft.org"
    5154      href="ftp://xmlsoft.org"/>
    … …  
    298301  </autotools>
    299302
     303  <autotools id="xserver" autogenargs="--disable-xinerama --enable-glx --enable-composite --disable-xorg --disable-dmx --disable-xnest --disable-xquartz --disable-xwin --disable-xephyr --disable-xfake --disable-xfbdev --disable-install-setuid --disable-unit-tests --enable-unix-transport --enable-tcp-transport --enable-local-transport --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb --with-xkb-bin-directory=/usr/bin">
     304    <dependencies>
     305      <dep package="pixman"/>
     306    </dependencies>
     307    <branch module="/releases/individual/xserver/xorg-server-1.12.4.tar.gz" version="1.12.4"
     308            repo="xorg"
     309            hash="sha256:d88225cd3c4a6ecd92d1360b34a0e5b6346e2a04c842c018cef36d8a370714ef"
     310            md5sum="19c17bf7ac3e2ce34bc40108692c031f">
     311      <patch file="xserver-remove-bogus-dependencies.patch" strip="1"/>
     312      <patch file="xserver-fix-glx-init.patch" strip="1"/>
     313    </branch>
     314  </autotools>
     315
    300316</moduleset>
Note: See TracChangeset for help on using the changeset viewer.