From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] gnu: rapicorn: Fix tests. Date: Sun, 15 May 2016 13:11:06 +0200 Message-ID: <1463310666-16921-1-git-send-email-rekado@elephly.net> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1txJ-0008ON-14 for guix-devel@gnu.org; Sun, 15 May 2016 07:11:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b1txE-0008E7-Nf for guix-devel@gnu.org; Sun, 15 May 2016 07:11:27 -0400 Received: from sender163-mail.zoho.com ([74.201.84.163]:24996) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1txE-0008Dy-FC for guix-devel@gnu.org; Sun, 15 May 2016 07:11:24 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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