[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#33012] [PATCH 3/3] ui: Fix port-buffering with address@hidden
From: |
ericbavier |
Subject: |
[bug#33012] [PATCH 3/3] ui: Fix port-buffering with address@hidden |
Date: |
Wed, 10 Oct 2018 20:52:46 -0500 |
From: Eric Bavier <address@hidden>
* guix/status.scm (build-event-output-port)address@hidden: Do not call 'setvbuf'
on custom binary port.
* tests/status.scm (current-build-output-port, UTF-8 + garbage)address@hidden:
Use "?" in place of REPLACEMENT CHARACTER.
---
guix/status.scm | 5 +++--
tests/status.scm | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/guix/status.scm b/guix/status.scm
index 13537c70c..6dba7e049 100644
--- a/guix/status.scm
+++ b/guix/status.scm
@@ -502,8 +502,9 @@ The second return value is a thunk to retrieve the current
state."
;; The build port actually receives Unicode strings.
(set-port-encoding! port "UTF-8")
- (setvbuf port (cond-expand (guile-2.2 'line) (else _IOLBF)))
-
+ (cond-expand
+ ((and guile-2 (not guile-2.2)) #t)
+ (else (setvbuf port 'line)))
(values port (lambda () %state)))
(define (call-with-status-report on-event thunk)
diff --git a/tests/status.scm b/tests/status.scm
index 486ad04dd..846a6f415 100644
--- a/tests/status.scm
+++ b/tests/status.scm
@@ -124,7 +124,10 @@
(test-equal "current-build-output-port, UTF-8 + garbage"
;; What about a mixture of UTF-8 + garbage?
- '((build-log "garbage: �lambda: λ\n"))
+ (let ((replacement (cond-expand
+ ((and guile-2 (not guile-2.2)) "?")
+ (else "�"))))
+ `((build-log ,(string-append "garbage: " replacement "lambda: λ\n"))))
(let-values (((port get-status) (build-event-output-port cons '())))
(display "garbage: " port)
(put-bytevector port #vu8(128))
--
2.19.0
- [bug#33009] [PATCH 0/3] Some address@hidden patches, ericbavier, 2018/10/10
- [bug#33011] [PATCH 1/3] gnu: guile2.0-guix: Fix build., ericbavier, 2018/10/10
- [bug#33012] [PATCH 3/3] ui: Fix port-buffering with address@hidden,
ericbavier <=
- [bug#33010] [PATCH 2/3] gnu: Add guix-minimal., ericbavier, 2018/10/10
- [bug#33010] [PATCH 2/3] gnu: Add guix-minimal., Eric Bavier, 2018/10/15
- [bug#33010] [PATCH 2/3] gnu: Add guix-minimal., Ludovic Courtès, 2018/10/15
- [bug#33010] [PATCH 2/3] gnu: Add guix-minimal., Eric Bavier, 2018/10/15