aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/cran.scm3
-rw-r--r--tests/hash.scm3
-rw-r--r--tests/nar.scm3
-rw-r--r--tests/ui.scm11
4 files changed, 13 insertions, 7 deletions
diff --git a/tests/cran.scm b/tests/cran.scm
index f92934c468..c162d45d8a 100644
--- a/tests/cran.scm
+++ b/tests/cran.scm
@@ -126,7 +126,8 @@ Date/Publication: 2015-07-14 14:15:16
"This is a long description spanning multiple lines: \
and it could confuse the parser that there is a colon : on the \
lines. And: this line continues the description.")
- ('license 'gpl3+)))
+ ('license 'gpl3+))
+ #t)
(x
(begin
(format #t "~s\n" x)
diff --git a/tests/hash.scm b/tests/hash.scm
index 8039549971..86501dca2d 100644
--- a/tests/hash.scm
+++ b/tests/hash.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2017 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -67,6 +67,7 @@ In Guile <= 2.0.9, CBIPs were always fully buffered, so the
(let-values (((port get)
(open-sha256-port)))
(put-bytevector port (string->utf8 "hello world"))
+ (force-output port)
(get)))
(test-assert "port-sha256"
diff --git a/tests/nar.scm b/tests/nar.scm
index 4f4b304b1d..28ead8b783 100644
--- a/tests/nar.scm
+++ b/tests/nar.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -186,6 +186,7 @@
(lambda ()
(let-values (((port get-hash) (open-sha256-port)))
(write-file input port)
+ (close-port port)
(get-hash)))
(lambda ()
(rm-rf input)))))
diff --git a/tests/ui.scm b/tests/ui.scm
index 058207e8b9..cfe417d497 100644
--- a/tests/ui.scm
+++ b/tests/ui.scm
@@ -248,9 +248,12 @@ Second line" 24))
(lambda ()
(show-manifest-transaction store m t)))))
(string-match "guile\t1.8.8 -> 2.0.9"
- (with-fluids ((%default-port-encoding "ISO-8859-1"))
- (with-error-to-string
- (lambda ()
- (show-manifest-transaction store m t)))))))))
+ (with-error-to-string
+ (lambda ()
+ ;; In Guile 2.2, %DEFAULT-PORT-ENCODING doesn't
+ ;; influence the encoding of string ports.
+ (set-port-encoding! (current-error-port)
+ "ISO-8859-1")
+ (show-manifest-transaction store m t))))))))
(test-end "ui")