02/02: gnu: mesa: Disable failing test on i686.

[guix-commits]

mbakke pushed a commit to branch staging
in repository guix.

commit 4bed3b101253e5f82c6423f0eb55b307ec839f53
Author: Marius Bakke <address@hidden>
Date:   Wed Jun 5 19:37:00 2019 +0200

    gnu: mesa: Disable failing test on i686.
    
    * gnu/packages/gl.scm (mesa)[arguments]: Add phase when building for i686.
---
 gnu/packages/gl.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index cfa3921..3680a89 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -328,6 +328,15 @@ also known as DXTn or DXTC) for Mesa.")
              (substitute* "src/intel/genxml/gen_pack_header.py"
                (("/usr/bin/env python2") (which "python")))
              #t))
+         ,@(if (string-prefix? "i686" (%current-system))
+               ;; Disable new test from Mesa 19 that fails on i686.  Upstream
+               ;; report: 
<https://bugs.freedesktop.org/show_bug.cgi?id=110612>.
+               `((add-after 'unpack 'disable-failing-test
+                   (lambda _
+                     (substitute* "src/gallium/tests/unit/meson.build"
+                       (("'u_format_test',") ""))
+                     #t)))
+               '())
          (add-before
            'configure 'fix-dlopen-libnames
            (lambda* (#:key inputs outputs #:allow-other-keys)