mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-27 06:42:14 -05:00
81a0f1cdf1
In 2.2, 'fport_close' no longer swallows EBADF and instead raises a
'system-error' for this. This commit adjusts for 2.2.
* guix/zlib.scm (close-procedure): Remove.
(make-gzip-input-port): Use 'port->fdes' instead of 'fileno'.
Use 'gzclose' instead of 'close-procedure'.
(make-gzip-output-port): Likewise.
* tests/zlib.scm ("compression/decompression pipe"): Don't check whether
PARENT is closed using 'port-closed?'. Instead, use 'seek' on the
underlying FD and check for EBADF.
72 lines
2.5 KiB
Scheme
72 lines
2.5 KiB
Scheme
;;; GNU Guix --- Functional package management for GNU
|
|
;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
|
|
;;;
|
|
;;; This file is part of GNU Guix.
|
|
;;;
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
;;; under the terms of the GNU General Public License as published by
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
;;; your option) any later version.
|
|
;;;
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;;; GNU General Public License for more details.
|
|
;;;
|
|
;;; You should have received a copy of the GNU General Public License
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
(define-module (test-zlib)
|
|
#:use-module (guix zlib)
|
|
#:use-module (guix tests)
|
|
#:use-module (srfi srfi-64)
|
|
#:use-module (rnrs bytevectors)
|
|
#:use-module (rnrs io ports)
|
|
#:use-module (ice-9 match))
|
|
|
|
;; Test the (guix zlib) module.
|
|
|
|
(unless (zlib-available?)
|
|
(exit 77))
|
|
|
|
(test-begin "zlib")
|
|
|
|
(test-assert "compression/decompression pipe"
|
|
(let ((data (random-bytevector (+ (random 10000)
|
|
(* 20 1024)))))
|
|
(match (pipe)
|
|
((parent . child)
|
|
(match (primitive-fork)
|
|
(0 ;compress
|
|
(dynamic-wind
|
|
(const #t)
|
|
(lambda ()
|
|
(close-port parent)
|
|
(call-with-gzip-output-port child
|
|
(lambda (port)
|
|
(put-bytevector port data))))
|
|
(lambda ()
|
|
(primitive-exit 0))))
|
|
(pid ;decompress
|
|
(begin
|
|
(close-port child)
|
|
(let ((received (call-with-gzip-input-port parent
|
|
(lambda (port)
|
|
(get-bytevector-all port))
|
|
#:buffer-size (* 64 1024))))
|
|
(match (waitpid pid)
|
|
((_ . status)
|
|
(and (zero? status)
|
|
|
|
;; PORT itself isn't closed but its underlying file
|
|
;; descriptor must have been closed by 'gzclose'.
|
|
(catch 'system-error
|
|
(lambda ()
|
|
(seek (fileno parent) 0 SEEK_CUR)
|
|
#f)
|
|
(lambda args
|
|
(= EBADF (system-error-errno args))))
|
|
|
|
(bytevector=? received data))))))))))))
|
|
|
|
(test-end)
|