all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Ricardo Wurmus <rekado@elephly.net>
To: guix-devel@gnu.org
Subject: [PATCH] gnu: rapicorn: Fix tests.
Date: Sun, 15 May 2016 13:11:06 +0200	[thread overview]
Message-ID: <1463310666-16921-1-git-send-email-rekado@elephly.net> (raw)

* gnu/packages/graphics.scm (rapicorn)[arguments]: Add build phases
"fix-tests" and "pre-check".  Generalize "replace-/bin/ls" phase to
"replace-fhs-paths".
[propagated-inputs]: Add python2-enum34.
[native-inputs]: Add xorg-server.
---
 gnu/packages/graphics.scm | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 64040c5..014082e 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -294,15 +294,30 @@ visual effects work for film.")
                 "1y51yjrpsihas1jy905m9p3r8iiyhq6bwi2690c564i5dnix1f9d"))))
     (build-system gnu-build-system)
     (arguments
-     `(;; FIXME: At least "testrcore1" fails.
-       #:tests? #f
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'replace-/bin/ls
+         (add-after 'unpack 'fix-tests
+           (lambda _
+             ;; Our grep does not support perl regular expressions.
+             (substitute* "taptool.sh"
+               (("grep -P") "grep -E"))
+             ;; Disable path tests because we cannot access /bin or /sbin.
+             (substitute* "rcore/tests/multitest.cc"
+               (("TCMP \\(Path::equals \\(\"/bin\"") "//"))
+             #t))
+         (add-before 'check 'pre-check
+           (lambda _
+             ;; The test suite requires a running X server (with DISPLAY
+             ;; number 99 or higher).
+             (system "Xvfb :99 &")
+             (setenv "DISPLAY" ":99")
+             #t))
+         (add-after 'unpack 'replace-fhs-paths
            (lambda _
              (substitute* (cons "Makefile.decl"
                                 (find-files "." "^Makefile\\.in$"))
-               (("/bin/ls") (which "ls")))
+               (("/bin/ls") (which "ls"))
+               (("/usr/bin/env") (which "env")))
              #t)))))
     ;; These libraries are listed in the "Required" section of the pkg-config
     ;; file.
@@ -310,7 +325,8 @@ visual effects work for film.")
      `(("librsvg" ,librsvg)
        ("cairo" ,cairo)
        ("pango" ,pango)
-       ("libxml2" ,libxml2)))
+       ("libxml2" ,libxml2)
+       ("python2-enum34" ,python2-enum34)))
     (inputs
      `(("gdk-pixbuf" ,gdk-pixbuf)
        ("libpng" ,libpng-1.2)
@@ -325,7 +341,8 @@ visual effects work for film.")
        ("doxygen" ,doxygen)
        ("graphviz" ,graphviz)
        ("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ("xvfb" ,xorg-server)))
     (home-page "http://rapicorn.org")
     (synopsis "Toolkit for rapid development of user interfaces")
     (description
-- 
2.7.3

             reply	other threads:[~2016-05-15 11:11 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-15 11:11 Ricardo Wurmus [this message]
2016-05-16  2:42 ` [PATCH] gnu: rapicorn: Fix tests Leo Famulari

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1463310666-16921-1-git-send-email-rekado@elephly.net \
    --to=rekado@elephly.net \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.