From: Cyrus Harmon <ch-sbcl@bobobeach.com>
Date: Fri, 11 Jun 2010 22:31:49 +0000 (+0000)
Subject: 1.0.39.10: cleanup sb-posix tests for darwin
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=faa1bdc63e953ad672a83fa20e5ff61cff92206f;p=sbcl.git

1.0.39.10: cleanup sb-posix tests for darwin

 * check for the error codes darwin gives back

 * use :latin-1 for *default-c-string-external-format* in readdir test
---

diff --git a/contrib/sb-posix/posix-tests.lisp b/contrib/sb-posix/posix-tests.lisp
index 9739323..549910b 100644
--- a/contrib/sb-posix/posix-tests.lisp
+++ b/contrib/sb-posix/posix-tests.lisp
@@ -108,10 +108,12 @@
       (sb-posix:mkdir #-win32 "/" #+win32 "C:/" 0)
     (sb-posix:syscall-error (c)
       (sb-posix:syscall-errno c)))
-  #-win32
-  #.sb-posix::eexist
+  #+darwin
+  #.sb-posix:eisdir
   #+win32
-  #.sb-posix:eacces)
+  #.sb-posix:eacces
+  #-(or darwin win32)
+  #.sb-posix::eexist)
 
 (define-eacces-test mkdir.error.3
   (let* ((dir (merge-pathnames
@@ -167,10 +169,12 @@
       (sb-posix:rmdir #-win32 "/" #+win32 "C:/")
     (sb-posix:syscall-error (c)
       (sb-posix:syscall-errno c)))
-  #-win32
-  #.sb-posix::ebusy
+  #+darwin
+  #.sb-posix:eisdir
   #+win32
-  #.sb-posix::eacces)
+  #.sb-posix::eacces
+  #-(or darwin win32)
+  #.sb-posix::ebusy)
 
 (deftest rmdir.error.4
   (let* ((dir (ensure-directories-exist
@@ -504,7 +508,8 @@
   nil)
 
 (deftest readdir.1
-  (let ((dir (sb-posix:opendir "/")))
+  (let ((dir (sb-posix:opendir "/"))
+        (sb-alien::*default-c-string-external-format* :latin-1))
     (unwind-protect
        (block dir-loop
          (loop for dirent = (sb-posix:readdir dir)
diff --git a/version.lisp-expr b/version.lisp-expr
index b4542ea..27d6cbf 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".)
-"1.0.39.9"
+"1.0.39.10"