1.0.39.19: asdf2 merge from upstream

[sbcl.git] / contrib / sb-posix / posix-tests.lisp

diff --git a/contrib/sb-posix/posix-tests.lisp b/contrib/sb-posix/posix-tests.lisp
index 300b322..78f99ba 100644 (file)
--- 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
@@ -213,7 +217,6 @@
         result)))
   #.sb-posix::eacces)
 \f
-#-darwin
 (deftest stat.1
   (let* ((stat (sb-posix:stat *test-directory*))
          (mode (sb-posix::stat-mode stat)))
@@ -221,7 +224,7 @@
     (logand mode (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec)))
   #.(logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec))
 
-#-(or darwin win32)
+#-win32
 (deftest stat.2
   (let* ((stat (sb-posix:stat "/"))
          (mode (sb-posix::stat-mode stat)))
@@ -242,7 +245,7 @@
     (< (- atime unix-now) 10))
   t)
 
-#-(or darwin win32)
+#-win32
 (deftest stat.4
   (let* ((stat (sb-posix:stat (make-pathname :directory '(:absolute :up))))
          (mode (sb-posix::stat-mode stat)))
@@ -331,7 +334,6 @@
     (sb-posix:s-isreg mode))
   nil)
 
-#-darwin
 (deftest stat-mode.2
   (with-stat-mode (mode *test-directory*)
     (sb-posix:s-isdir mode))
@@ -358,7 +360,7 @@
     (sb-posix:s-issock mode))
   nil)
 
-#-(or win32 darwin)
+#-win32
 (deftest stat-mode.7
   (let ((link-pathname (make-pathname :name "stat-mode.7"
                                       :defaults *test-directory*)))
@@ -370,7 +372,6 @@
       (ignore-errors (sb-posix:unlink link-pathname))))
   t)
 
-#-darwin
 (deftest stat-mode.8
   (let ((pathname (make-pathname :name "stat-mode.8"
                                  :defaults *test-directory*)))
@@ -611,12 +612,12 @@
   t)
 
 
-#-(or darwin win32)
+#-win32
 (deftest time.1
     (plusp (sb-posix:time))
   t)
 
-#-(or darwin win32)
+#-win32
 (deftest utimes.1
     (let ((file (merge-pathnames #p"utimes.1" *test-directory*))
           (atime (random (1- (expt 2 31))))