Changeset 170040 in webkit

Timestamp:

Jun 16, 2014 7:26:36 PM (10 years ago)

Author:

yoon@igalia.com

Message:

[GTK] Add llvmpipe (Mesa) to the JHBuild moduleset and force it when running layout tests
​https://bugs.webkit.org/show_bug.cgi?id=131472

Reviewed by Martin Robinson.

This patch reapplies r167510 with fixes to add llvm as a dependency for llvmpipe.

• Scripts/webkitpy/port/xvfbdriver.py:

(XvfbDriver._start): Use the LLVMPIPE_LIBGL_PATH to set the LD_LIBRARY_PATH
when running WebKitTestRunner with the Xvfb driver.

• gtk/install-dependencies: Add LLVM as a dependency to build llvmpipe.
• gtk/jhbuild.modules: Add Mesa to the modulelist so that the llvmpipe libGL is build, but not

installed.

• gtk/jhbuildrc: Set the LLVMPIPE_LIBGL_PATH environment variable so that the test driver knows

how to properly set the LD_LIBRARY_PATH variable. We do this because it is much easier to
calculate the path in the jhbuildrc than in the test driver code. This simplifies things a great
deal.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/xvfbdriver.py (modified) (2 diffs)
• gtk/install-dependencies (modified) (2 diffs)
• gtk/jhbuild.modules (modified) (3 diffs)
• gtk/jhbuildrc (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-06-16  Gwang Yoon Hwang  <yoon@igalia.com>
+
+        [GTK] Add llvmpipe (Mesa) to the JHBuild moduleset and force it when running layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=131472
+
+        Reviewed by Martin Robinson.
+
+        This patch reapplies r167510 with fixes to add llvm as a dependency for llvmpipe.
+
+        * Scripts/webkitpy/port/xvfbdriver.py:
+        (XvfbDriver._start): Use the LLVMPIPE_LIBGL_PATH to set the LD_LIBRARY_PATH
+        when running WebKitTestRunner with the Xvfb driver.
+        * gtk/install-dependencies: Add LLVM as a dependency to build llvmpipe.
+        * gtk/jhbuild.modules: Add Mesa to the modulelist so that the llvmpipe libGL is build, but not
+        installed.
+        * gtk/jhbuildrc: Set the LLVMPIPE_LIBGL_PATH environment variable so that the test driver knows
+        how to properly set the LD_LIBRARY_PATH variable. We do this because it is much easier to
+        calculate the path in the jhbuildrc than in the test driver code. This simplifies things a great
+        deal.
+
 2014-06-16  Tanay C  <tanay.c@samsung.com>
 

trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py

@@ -78 +78 @@
         self._lock_file = "/tmp/.X%d-lock" % display_id
 
+        server_name = self._port.driver_name()
+        environment = self._port.setup_environ_for_server(server_name)
+
+        llvmpipe_libgl_path = os.environ.get('LLVMPIPE_LIBGL_PATH')
+        if llvmpipe_libgl_path:
+            environment['LD_LIBRARY_PATH'] = '%s:%s' % (llvmpipe_libgl_path, os.environ.get('LD_LIBRARY_PATH', ''))
+
         run_xvfb = ["Xvfb", ":%d" % display_id, "-screen",  "0", "800x600x%s" % self._xvfb_screen_depth(), "-nolisten", "tcp"]
         with open(os.devnull, 'w') as devnull:
@@ -86 +93 @@
         time.sleep(self._startup_delay_secs)
 
-        server_name = self._port.driver_name()
-        environment = self._port.setup_environ_for_server(server_name)
         # We must do this here because the DISPLAY number depends on _worker_number
         environment['DISPLAY'] = ":%d" % display_id

trunk/Tools/gtk/install-dependencies

@@ -110 +110 @@
         libxfont-dev \
         libxkbfile-dev \
+        llvm \
         python-dev \
         ragel \
@@ -207 +208 @@
         libtiff-devel \
         libxkbfile-devel \
+        llvm \
         mesa-libEGL-devel \
         ragel \

trunk/Tools/gtk/jhbuild.modules

@@ -30 +30 @@
       <dep package="gst-libav"/>
       <dep package="xserver"/>
+      <dep package="mesa"/>
     </dependencies>
   </metamodule>
@@ -49 +50 @@
   <repository type="tarball" name="xorg"
       href="http://xorg.freedesktop.org"/>
+  <repository type="tarball" name="ftp.freedesktop.org"
+      href="ftp://ftp.freedesktop.org"/>
   <repository type="tarball" name="xmlsoft.org"
       href="ftp://xmlsoft.org"/>
@@ -332 +335 @@
   </autotools>
 
+  <autotools id="mesa" autogenargs="--enable-xlib-glx --disable-dri --with-gallium-drivers=swrast" skip-install="true">
+    <branch module="/pub/mesa/10.2.1/MesaLib-10.2.1.tar.bz2" version="10.2.1"
+            checkoutdir="Mesa-10.2.1"
+            repo="ftp.freedesktop.org"
+            hash="sha256:461277909207da689d8152cfbf9e182ea6f70e1e672ab64c67df83725c8d2b54"/>
+  </autotools>
+
 </moduleset>

trunk/Tools/gtk/jhbuildrc

@@ -32 +32 @@
 # annotations sooner rather than later.
 autogenargs='--enable-introspection'
+
+if use_lib64:
+    os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(checkoutroot, 'Mesa-10.2.1', 'lib64'))
+else:
+    os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(checkoutroot, 'Mesa-10.2.1', 'lib'))