From 2a353a3dbc45675c8275e83d0e04908b3ba4b634 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Fri, 14 Oct 2022 20:40:08 -0400 Subject: [PATCH] nongnu: mesa-next: Fix failing test for i686-linux. * nongnu/packages/mesa.scm (mesa-next)[phases]{fix-instrfromstring-test}: New phase. Fix the instrfromstring test which fails on i686 using the upstream change. --- nongnu/packages/mesa.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nongnu/packages/mesa.scm b/nongnu/packages/mesa.scm index 3f5053c..8272715 100644 --- a/nongnu/packages/mesa.scm +++ b/nongnu/packages/mesa.scm @@ -237,6 +237,15 @@ svga,swrast,virgl"))) (("'lp_test_arit', ") "")))) (_ '((display "No tests to disable on this architecture.\n")))))) + ,@(if (string=? (%current-system) "i686-linux") + '((add-after 'disable-failing-test 'fix-instrfromstring-test + (lambda _ + ;; The instrfromstring test fails on i686, which has been already + ;; fixed upstream but not in 22.2.1. + ;; TODO: remove on update + (substitute* "src/gallium/drivers/r600/sfn/sfn_instr_export.cpp" + (("buf\\[6\\]") "buf[6] = {0}"))))) + '()) (add-before 'configure 'fix-dlopen-libnames (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")))