guix-commits
[Top][All Lists]
Advanced

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

03/07: gnu: rdup: Fix build, disable encryption.


From: guix-commits
Subject: 03/07: gnu: rdup: Fix build, disable encryption.
Date: Fri, 1 Nov 2019 19:36:35 -0400 (EDT)

nckx pushed a commit to branch master
in repository guix.

commit d939b2955d8de2084f550a9063ce0c8006ecc4fa
Author: Tobias Geerinckx-Rice <address@hidden>
Date:   Fri Nov 1 23:36:06 2019 +0100

    gnu: rdup: Fix build, disable encryption.
    
    * gnu/packages/backup.scm (nettle)[inputs]: Remove nettle.
    [arguments]: Add ‘disable-failing-tests’ phase.
---
 gnu/packages/backup.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 508ed9c..0894cb3 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -308,11 +308,14 @@ random access nor for in-place modification.")
        ;; For tests.
        ("dejagnu" ,dejagnu)))
     (inputs
+     ;; XXX Compiling with nettle (encryption) support requires patching out
+     ;; -Werror from GNUmakefile.in.  Then, rdup-tr-{en,de}crypt tests fail:
+     ;; free(): invalid pointer
+     ;; ** rdup-tr: SIGPIPE received, exiting
      `(("glib" ,glib)
        ("pcre" ,pcre)
        ("libarchive" ,libarchive)
-       ("mcrypt" ,mcrypt)
-       ("nettle" ,nettle)))
+       ("mcrypt" ,mcrypt)))
     (arguments
      `(#:parallel-build? #f             ;race conditions
        #:phases
@@ -328,6 +331,13 @@ random access nor for in-place modification.")
                ;; Avoid frivolous dependency on ‘which’ with a shell builtin.
                (("which") "command -v"))
              #t))
+         (add-before 'check 'disable-encryption-tests
+           (lambda _
+             (for-each delete-file
+                       (list "testsuite/rdup/rdup.rdup-tr-crypt.exp"
+                             "testsuite/rdup/rdup.rdup-tr-decrypt.exp"
+                             "testsuite/rdup/rdup.rdup-tr-encrypt.exp"))
+             #t))
          (add-before 'check 'pre-check
            (lambda _
              (setenv "HOME" (getcwd))



reply via email to

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