From: Andreas Fuchs <asf@boinkor.net>
Date: Thu, 27 Nov 2003 21:50:02 +0000 (+0000)
Subject: 0.8.6.7:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=c7b7abe4e260e8d3239da24516ce7b0101dde544;hp=7f371592aa68d0b21544a013bfcde79fe6617eea;p=sbcl.git

0.8.6.7:
	Fix sb-posix tests for BSDs:
	* Replace #xffffffff for directory modes with a more portable
	  constant (BSD's mode_t is 16 bits, so this makes the type
	  checker happy)
	* Conditionalize the (buggy) return value for mkdir/rmdir on
	  *BSD.
---

diff --git a/contrib/sb-posix/posix-tests.lisp b/contrib/sb-posix/posix-tests.lisp
index dd5784c..1a3eb6f 100644
--- a/contrib/sb-posix/posix-tests.lisp
+++ b/contrib/sb-posix/posix-tests.lisp
@@ -12,6 +12,11 @@
 (defvar *current-directory* *default-pathname-defaults*)
 
 (defvar *this-file* *load-truename*)
+
+(eval-when (:compile-toplevel :load-toplevel)
+  (defconstant +mode-rwx-all+ (logior sb-posix::s-irusr sb-posix::s-iwusr sb-posix::s-ixusr
+				      sb-posix::s-irgrp sb-posix::s-iwgrp sb-posix::s-ixgrp
+				      sb-posix::s-iroth sb-posix::s-iwoth sb-posix::s-ixoth)))
 
 (deftest chdir.1
   (sb-posix:chdir *test-directory*)
@@ -76,7 +81,8 @@
       (sb-posix:mkdir "/" 0)
     (sb-posix:syscall-error (c)
       (sb-posix:syscall-errno c)))
-  #.sb-posix::eexist)
+  #-bsd #.sb-posix::eexist
+  #+bsd #.sb-posix::eisdir)
 
 (deftest mkdir.error.3
   (handler-case
@@ -118,7 +124,8 @@
       (sb-posix:rmdir "/")
     (sb-posix:syscall-error (c)
       (sb-posix:syscall-errno c)))
-  #.sb-posix::ebusy)
+  #-bsd #.sb-posix::ebusy
+  #+bsd #.sb-posix::eisdir)
 
 (deftest rmdir.error.4
   (let* ((dir (ensure-directories-exist
@@ -145,8 +152,8 @@
 	 (dir2 (merge-pathnames
 		(make-pathname :directory '(:relative "unremovable"))
 		dir)))
-    (sb-posix:mkdir dir #xffffffff)
-    (sb-posix:mkdir dir2 #xffffffff)
+    (sb-posix:mkdir dir +mode-rwx-all+)
+    (sb-posix:mkdir dir2 +mode-rwx-all+)
     (sb-posix:chmod dir 0)
     (handler-case
 	(sb-posix:rmdir dir2)
@@ -199,7 +206,7 @@
 	 (file (merge-pathnames
 		(make-pathname :name "unstatable")
 		dir)))
-    (sb-posix:mkdir dir #xffffffff)
+    (sb-posix:mkdir dir +mode-rwx-all+)
     (with-open-file (s file :direction :output)
       (write "" :stream s))
     (sb-posix:chmod dir 0)
diff --git a/version.lisp-expr b/version.lisp-expr
index 62d7642..e8d8df7 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.8.6.6"
+"0.8.6.7"