guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/06: gnu: kpackage: Enable test-suite.


From: guix-commits
Subject: 03/06: gnu: kpackage: Enable test-suite.
Date: Wed, 16 Jan 2019 18:19:54 -0500 (EST)

htgoebel pushed a commit to branch master
in repository guix.

commit 8c81e9f2db8fe25f2ba65d0f1f0ba34a6cc7b5e6
Author: Hartmut Goebel <address@hidden>
Date:   Wed Jan 2 00:41:53 2019 +0100

    gnu: kpackage: Enable test-suite.
    
    * gnu/package/kde-frameworks.scm(kpackage)[arguments]
      <#:tests?>: Remove. <#:phases>: Add phase 'patch-tests.
---
 gnu/packages/kde-frameworks.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index f31e143..d712043 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1835,8 +1835,7 @@ covers feedback and persistent events.")
        ("ki18n" ,ki18n)
        ("qtbase" ,qtbase)))
     (arguments
-     `(#:tests? #f ; FIXME: 3/9 tests fail.
-       #:phases
+     `(#:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch
            (lambda _
@@ -1848,6 +1847,17 @@ covers feedback and persistent events.")
                (("^\\s*(QDirIterator it\\(.*, 
QDirIterator::Subdirectories)(\\);)" _ a b)
                 (string-append a " | QDirIterator::FollowSymlinks" b)))
              #t))
+         (add-after 'unpack 'patch-tests
+           (lambda _
+             ;; /bin/ls doesn't exist in the build-container use /etc/passwd
+             (substitute* "autotests/packagestructuretest.cpp"
+               (("(addDirectoryDefinition\\(\")bin(\".*\")bin(\".*\")bin\""
+                 _ a b c)
+                (string-append a "etc" b "etc" c "etc\""))
+               (("filePath\\(\"bin\", QStringLiteral\\(\"ls\"))")
+                "filePath(\"etc\", QStringLiteral(\"passwd\"))")
+               (("\"/bin/ls\"") "\"/etc/passwd\""))
+             #t))
          (add-before 'check 'check-setup
            (lambda _
              (setenv "HOME" (getcwd))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]