summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2014-07-02 18:28:06 +0300
committerEli Zaretskii <eliz@gnu.org>2014-07-02 18:28:06 +0300
commit0d77e062dc70ed10cfcedf1e6080287f8be20b1b (patch)
tree005657dc805695ce339fffcfa2239fc9a25ab09f
parentc7161ee334c20a81cb50512b2d6ae0aebf34ede9 (diff)
downloadguile-0d77e062dc70ed10cfcedf1e6080287f8be20b1b.tar.gz
Fix deletion of ports.test test file on MS-Windows.
* test-suite/tests/ports.test ("fdes->port", "seek") ("truncate-file"): Close every file and port we open, to avoid failure to delete the test file on MS-Windows when the test is completed.
-rw-r--r--test-suite/tests/ports.test25
1 files changed, 17 insertions, 8 deletions
diff --git a/test-suite/tests/ports.test b/test-suite/tests/ports.test
index d87257e04..e7acd6332 100644
--- a/test-suite/tests/ports.test
+++ b/test-suite/tests/ports.test
@@ -1270,9 +1270,10 @@
(with-test-prefix
"fdes->port"
(pass-if "fdes->ports finds port"
- (let ((port (open-file (test-file) "w")))
-
- (not (not (memq port (fdes->ports (port->fdes port))))))))
+ (let* ((port (open-file (test-file) "w"))
+ (res (not (not (memq port (fdes->ports (port->fdes port)))))))
+ (close-port port)
+ res)))
;;;
;;; seek
@@ -1289,7 +1290,9 @@
(let ((port (open-file (test-file) "r")))
(read-char port)
(seek port 2 SEEK_CUR)
- (eqv? #\d (read-char port))))
+ (let ((res (eqv? #\d (read-char port))))
+ (close-port port)
+ res)))
(pass-if "SEEK_SET"
(call-with-output-file (test-file)
@@ -1298,7 +1301,9 @@
(let ((port (open-file (test-file) "r")))
(read-char port)
(seek port 3 SEEK_SET)
- (eqv? #\d (read-char port))))
+ (let ((res (eqv? #\d (read-char port))))
+ (close-port port)
+ res)))
(pass-if "SEEK_END"
(call-with-output-file (test-file)
@@ -1307,7 +1312,9 @@
(let ((port (open-file (test-file) "r")))
(read-char port)
(seek port -2 SEEK_END)
- (eqv? #\d (read-char port))))))
+ (let ((res (eqv? #\d (read-char port))))
+ (close-port port)
+ res)))))
;;;
;;; truncate-file
@@ -1370,7 +1377,8 @@
(lambda (port)
(display "hello" port)))
(let ((port (open-file (test-file) "r+")))
- (truncate-file port 1))
+ (truncate-file port 1)
+ (close-port port))
(eqv? 1 (stat:size (stat (test-file)))))
(pass-if "shorten to current pos"
@@ -1379,7 +1387,8 @@
(display "hello" port)))
(let ((port (open-file (test-file) "r+")))
(read-char port)
- (truncate-file port))
+ (truncate-file port)
+ (close-port port))
(eqv? 1 (stat:size (stat (test-file)))))))