aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-02-15 21:40:08 +0100
committerMarius Bakke <mbakke@fastmail.com>2017-02-19 01:19:32 +0100
commit8ef8de799fcbc7b1a04be0d33e1183c766d0f893 (patch)
tree5e4a4e16efc862b2f0c1f03b51ed04e93ac81dcb
parenta10b9810c6abfca006c8f2e0c2f8a4c60753c338 (diff)
downloadpatches-8ef8de799fcbc7b1a04be0d33e1183c766d0f893.tar
patches-8ef8de799fcbc7b1a04be0d33e1183c766d0f893.tar.gz
gnu: duplicity: Fix tests.
* gnu/packages/backup.scm (duplicity)[native-inputs]: Add PAR2CMDLINE. [arguments]: Move /bin/sh substitution to 'patch-source' phase and add one file.
-rw-r--r--gnu/packages/backup.scm19
1 files changed, 11 insertions, 8 deletions
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index 8dbe32ebdd..809d54a646 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -67,6 +67,7 @@
(build-system python-build-system)
(native-inputs
`(("util-linux" ,util-linux) ;setsid command, for the tests
+ ("par2cmdline" ,par2cmdline)
("python-pexpect" ,python2-pexpect)
("mock" ,python2-mock)))
(propagated-inputs
@@ -83,16 +84,18 @@
#:test-target "test"
#:phases
(modify-phases %standard-phases
- (add-before
- 'build 'patch-source ; embed gpg store name
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "duplicity/gpginterface.py"
- (("self.call = 'gpg'")
- (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'")))))
- (add-before 'check 'check-setup
+ (add-before 'build 'patch-source
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "testing/functional/__init__.py"
+ ;; embed gpg store name
+ (substitute* "duplicity/gpginterface.py"
+ (("self.call = 'gpg'")
+ (string-append "self.call = '" (assoc-ref inputs "gnupg") "/bin/gpg'")))
+ (substitute* '("testing/functional/__init__.py"
+ "testing/overrides/bin/lftp")
(("/bin/sh") (which "sh")))
+ #t))
+ (add-before 'check 'check-setup
+ (lambda* (#:key inputs #:allow-other-keys)
(setenv "HOME" (getcwd)) ;gpg needs to write to $HOME
(setenv "TZDIR" ;some timestamp checks need TZDIR
(string-append (assoc-ref inputs "tzdata")