Title: [192471] trunk/Tools
Revision
192471
Author
carlo...@webkit.org
Date
2015-11-16 08:13:51 -0800 (Mon, 16 Nov 2015)

Log Message

Unreviewed. Fix GTK+ layout tests running after r192469.

We fail to find the Gallium llvmpipe driver because of the build
directory change in r192469.

* gtk/jhbuildrc: Use buildroot instead of checkoutdir to build
the LLVMPIPE_LIBGL_PATH.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (192470 => 192471)


--- trunk/Tools/ChangeLog	2015-11-16 14:15:12 UTC (rev 192470)
+++ trunk/Tools/ChangeLog	2015-11-16 16:13:51 UTC (rev 192471)
@@ -1,5 +1,15 @@
 2015-11-16  Carlos Garcia Campos  <cgar...@igalia.com>
 
+        Unreviewed. Fix GTK+ layout tests running after r192469.
+
+        We fail to find the Gallium llvmpipe driver because of the build
+        directory change in r192469.
+
+        * gtk/jhbuildrc: Use buildroot instead of checkoutdir to build
+        the LLVMPIPE_LIBGL_PATH.
+
+2015-11-16  Carlos Garcia Campos  <cgar...@igalia.com>
+
         [GTK] Use FTL by default when LLVM 3.7 is available
         https://bugs.webkit.org/show_bug.cgi?id=142128
 

Modified: trunk/Tools/gtk/jhbuildrc (192470 => 192471)


--- trunk/Tools/gtk/jhbuildrc	2015-11-16 14:15:12 UTC (rev 192470)
+++ trunk/Tools/gtk/jhbuildrc	2015-11-16 16:13:51 UTC (rev 192471)
@@ -39,9 +39,9 @@
 buildroot = os.path.join(os.path.dirname(checkoutroot), "Build")
 
 if use_lib64:
-    os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(checkoutroot, 'Mesa', 'lib64', 'gallium'))
+    os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(buildroot, 'Mesa', 'lib64', 'gallium'))
 else:
-    os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(checkoutroot, 'Mesa', 'lib', 'gallium'))
+    os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(buildroot, 'Mesa', 'lib', 'gallium'))
 
 if 'x86_64' in platform.machine():
     conditions.add('x86_64')
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to