From 57d893458e9cb6fdc902d78f69fc3e4f362fe778 Mon Sep 17 00:00:00 2001 From: Juho Snellman Date: Fri, 4 Aug 2006 14:34:46 +0000 Subject: [PATCH] 0.9.15.10: win32 changes to the test suite from Yaroslav Kavenchuk. --- tests/callback.impure.lisp | 2 ++ tests/external-format.impure.lisp | 2 +- tests/stream.pure.lisp | 4 ++-- version.lisp-expr | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/callback.impure.lisp b/tests/callback.impure.lisp index 068515c..34bb23f 100644 --- a/tests/callback.impure.lisp +++ b/tests/callback.impure.lisp @@ -41,6 +41,8 @@ ;;; actually using a callback with foreign code +#+win32 (sb-alien:load-shared-object "ntdll.dll") + (define-alien-routine qsort void (base (* t)) (nmemb int) diff --git a/tests/external-format.impure.lisp b/tests/external-format.impure.lisp index 7724c96..1373538 100644 --- a/tests/external-format.impure.lisp +++ b/tests/external-format.impure.lisp @@ -22,7 +22,7 @@ ,@body)))) (do-external-formats (xf) - (with-open-file (s "/dev/null" :direction :input :external-format xf) + (with-open-file (s #-win32 "/dev/null" #+win32 "nul" :direction :input :external-format xf) (assert (eq (read-char s nil s) s)))) ;;; Test standard character read-write equivalency over all external formats. diff --git a/tests/stream.pure.lisp b/tests/stream.pure.lisp index bd2f071..b059537 100644 --- a/tests/stream.pure.lisp +++ b/tests/stream.pure.lisp @@ -261,7 +261,7 @@ (frob 'base-char) (frob 'nil)) -(with-open-file (s "/dev/null" :element-type '(signed-byte 48)) +(with-open-file (s #-win32 "/dev/null" #+win32 "nul" :element-type '(signed-byte 48)) (assert (eq :eof (read-byte s nil :eof)))) (let* ((is (make-string-input-stream "foo")) @@ -292,7 +292,7 @@ (assert (string= (get-output-stream-string os) "foo"))) (with-standard-io-syntax - (open "/dev/null")) + (open #-win32 "/dev/null" #+win32 "nul" )) ;;; PEEK-CHAR T uses whitespace[2] (let ((*readtable* (copy-readtable))) diff --git a/version.lisp-expr b/version.lisp-expr index 12c9857..31c52f2 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.9.15.9" +"0.9.15.10" -- 1.7.10.4