1.0.12.2: oops, test in wrong place

[sbcl.git] / tests / stream.impure.lisp

diff --git a/tests/stream.impure.lisp b/tests/stream.impure.lisp
index c0830a6..2db6606 100644 (file)
--- a/tests/stream.impure.lisp
+++ b/tests/stream.impure.lisp
@@ -91,7 +91,10 @@
     (with-standard-io-syntax
       (prin1 'insert s)))
   (with-open-file (s p)
-    (assert (string= (read-line s) "THESE INSERTMBOLS")))
+    (let ((line (read-line s))
+          (want "THESE INSERTMBOLS"))
+      (unless (equal line want)
+        (error "wanted ~S, got ~S" want line))))
   (delete-file p))
 \f
 ;;; :DIRECTION :IO didn't work on non-existent pathnames
@@ -291,6 +294,7 @@
   (let ((sequence (make-array 1 :element-type '(signed-byte 8))))
     (with-open-file (stream pathname
                             :direction :input
+                            :external-format :latin1
                             :element-type :default)
       (handler-case (progn
                       (read-sequence sequence stream)
@@ -298,8 +302,8 @@
         (type-error (condition)
           (assert (eql (type-error-datum condition) (code-char 255)))
           (assert (subtypep (type-error-expected-type condition)
-                            '(signed-byte 8))))))))
-
+                            '(signed-byte 8)))))))
+  (delete-file pathname))
 \f
 ;;; Check WRITE-SEQUENCE signals a TYPE-ERROR when the stream can't
 ;;; write a sequence element.
@@ -410,6 +414,32 @@
       (type-error (condition)
         (assert (= (type-error-datum condition) -1))
         (assert (subtypep (type-error-expected-type condition)
-                          '(unsigned-byte 8)))))))
+                          '(unsigned-byte 8))))))
+
+  (delete-file pathname))
+
+;;; writing looong lines. takes way too long and way too much space
+;;; to test on 64 bit platforms
+#-#.(cl:if (cl:= sb-vm:n-word-bits 64) '(and) '(or))
+(progn
+  (defun write-n-chars (n stream)
+    (format t "~&/writing ~D chars on a single line~%" n)
+    (finish-output t)
+    (loop repeat n
+       do (write-char #\x stream))
+    (terpri stream)
+    n)
+
+  (let ((test "long-lines-write-test.tmp"))
+    (unwind-protect
+         (with-open-file (f test
+                            :direction :output
+                            :external-format :ascii
+                            :element-type 'character
+                            :if-does-not-exist :create
+                            :if-exists :supersede)
+         (write-n-chars (+ most-positive-fixnum 7) f))
+      (when (probe-file test)
+        (delete-file test)))))
 
 ;;; success