guix-commits
[Top][All Lists]
Advanced

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

01/01: gnu: gmime: Use ISO-8859-1 when patching tests.


From: Mark H. Weaver
Subject: 01/01: gnu: gmime: Use ISO-8859-1 when patching tests.
Date: Sat, 07 Mar 2015 06:12:30 +0000

mhw pushed a commit to branch master
in repository guix.

commit 93c117eec3680c3f2b8d8fe4aafb99db352c468e
Author: Mark H Weaver <address@hidden>
Date:   Sat Mar 7 01:09:55 2015 -0500

    gnu: gmime: Use ISO-8859-1 when patching tests.
    
    * gnu/packages/mail.scm (gmime)[arguments]: Use ISO-8859-1 when patching
      tests.
---
 gnu/packages/mail.scm |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 33076c1..4aa74fe 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -227,14 +227,16 @@ operating systems.")
        (alist-cons-after
         'unpack 'patch-paths-in-tests
         (lambda _
-          ;; The test programs run several programs using 'system'
-          ;; with hard-coded paths.  Here we patch them all.  We also
-          ;; change "gpg" to "gpg2".
-          (substitute* (find-files "tests" "\\.c$")
-            (("(system *\\(\")(/[^ ]*)" all pre prog-path)
-             (let* ((base (basename prog-path))
-                    (prog (which (if (string=? base "gpg") "gpg2" base))))
-              (string-append pre (or prog (error "not found: " base)))))))
+          ;; The test programs run several programs using 'system' with
+          ;; hard-coded paths.  Here we patch them all.  We also change "gpg"
+          ;; to "gpg2".  We use ISO-8859-1 here because test-iconv.c contains
+          ;; raw byte sequences in several different encodings.
+          (with-fluids ((%default-port-encoding #f))
+            (substitute* (find-files "tests" "\\.c$")
+              (("(system *\\(\")(/[^ ]*)" all pre prog-path)
+               (let* ((base (basename prog-path))
+                      (prog (which (if (string=? base "gpg") "gpg2" base))))
+                 (string-append pre (or prog (error "not found: " base))))))))
         %standard-phases)))
     (home-page "http://spruce.sourceforge.net/gmime/";)
     (synopsis "MIME message parser and creator library")



reply via email to

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