summary refs log tree commit diff
path: root/tests/status.scm
diff options
context:
space:
mode:
authorEric Bavier <bavier@cray.com>2018-10-10 16:42:02 -0500
committerEric Bavier <bavier@member.fsf.org>2018-10-16 17:12:09 -0500
commit278f86a43f1561b1c064ce88da012db414ec7efc (patch)
tree9fb4e195618afa1ca94075fe1ff988d7e1cf6893 /tests/status.scm
parent6f1ce09d79fa6148459c90120881e825551651b2 (diff)
downloadguix-278f86a43f1561b1c064ce88da012db414ec7efc.tar.gz
ui: Fix port-buffering with guile@2.0.
* guix/status.scm (build-event-output-port)[guile@2.0]: Do not call 'setvbuf'
on custom binary port.
* tests/status.scm (current-build-output-port, UTF-8 + garbage)[guile@2.0]:
Use "?" in place of REPLACEMENT CHARACTER.
Diffstat (limited to 'tests/status.scm')
-rw-r--r--tests/status.scm5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/status.scm b/tests/status.scm
index 3b74946673..99abb41c8b 100644
--- a/tests/status.scm
+++ b/tests/status.scm
@@ -125,7 +125,10 @@
 
 (test-equal "current-build-output-port, UTF-8 + garbage"
   ;; What about a mixture of UTF-8 + garbage?
-  '((build-log #f "garbage: �lambda: λ\n"))
+  (let ((replacement (cond-expand
+                      ((and guile-2 (not guile-2.2)) "?")
+                      (else "�"))))
+    `((build-log #f ,(string-append "garbage: " replacement "lambda: λ\n"))))
   (let-values (((port get-status) (build-event-output-port cons '())))
     (display "garbage: " port)
     (put-bytevector port #vu8(128))