X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-posix%2Fposix-tests.lisp;h=a82bd7e085dea0dcce9f2800af993afff2f960cd;hb=77d94d36bcfd3d5eea73ad51e6ee621a8938f995;hp=41d9b2fdf86b483f16897694cf0b95257bdb92b1;hpb=808502965803b3772ea40dab28ec85dc131e676a;p=sbcl.git

diff --git a/contrib/sb-posix/posix-tests.lisp b/contrib/sb-posix/posix-tests.lisp
index 41d9b2f..a82bd7e 100644
--- a/contrib/sb-posix/posix-tests.lisp
+++ b/contrib/sb-posix/posix-tests.lisp
@@ -17,6 +17,14 @@
   (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)))
+
+(defmacro define-eacces-test (name form &rest values)
+  `(deftest ,name
+    (block ,name
+      (when (= (sb-posix:geteuid) 0)
+	(return-from ,name (values ,@values)))
+      ,form)
+    ,@values))
 
 (deftest chdir.1
   (sb-posix:chdir *test-directory*)
@@ -95,11 +103,23 @@
       (sb-posix:syscall-errno c)))
   #.sb-posix::eexist)
 
-(deftest mkdir.error.3
-  (handler-case
-      (sb-posix:mkdir "/almost-certainly-does-not-exist" 0)
-    (sb-posix:syscall-error (c)
-      (sb-posix:syscall-errno c)))
+(define-eacces-test mkdir.error.3
+  (let* ((dir (merge-pathnames
+	       (make-pathname :directory '(:relative "mkdir.error.3"))
+	       *test-directory*))
+	 (dir2 (merge-pathnames
+		(make-pathname :directory '(:relative "does-not-exist"))
+		dir)))
+    (sb-posix:mkdir dir 0)
+    (handler-case
+	(sb-posix:mkdir dir2 0)
+      (sb-posix:syscall-error (c)
+	(sb-posix:rmdir dir)
+	(sb-posix:syscall-errno c))
+      (:no-error (result)
+	(sb-posix:rmdir dir2)
+	(sb-posix:rmdir dir)
+	result)))
   #.sb-posix::eacces)
 
 (deftest rmdir.1
@@ -129,7 +149,6 @@
       (sb-posix:syscall-errno c)))
   #.sb-posix::enotdir)
 
-#-sunos ; Apparently gives EINVAL on SunOS 8, which doesn't make sense
 (deftest rmdir.error.3
   (handler-case
       (sb-posix:rmdir "/")
@@ -155,7 +174,7 @@
 	  (or (= errno sb-posix::eexist) (= errno sb-posix::enotempty))))))
   t)
 
-(deftest rmdir.error.5
+(define-eacces-test rmdir.error.5
   (let* ((dir (merge-pathnames
 	       (make-pathname :directory '(:relative "rmdir.error.5"))
 	       *test-directory*))
@@ -171,7 +190,11 @@
 	(sb-posix:chmod dir (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec))
 	(sb-posix:rmdir dir2)
 	(sb-posix:rmdir dir)
-	(sb-posix:syscall-errno c))))
+	(sb-posix:syscall-errno c))
+      (:no-error (result)
+	(sb-posix:chmod dir (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec))
+	(sb-posix:rmdir dir)
+	result)))
   #.sb-posix::eacces)
 
 (deftest stat.1
@@ -200,7 +223,7 @@
     (< (- atime unix-now) 10))
   t)
 
-(deftest stat.2
+(deftest stat.4
   (let* ((stat (sb-posix:stat (make-pathname :directory '(:absolute :up))))
 	 (mode (sb-posix::stat-mode stat)))
     ;; it's logically possible for / to be writeable by others... but
@@ -218,7 +241,7 @@
       (sb-posix:syscall-errno c)))
   #.sb-posix::enoent)
 
-(deftest stat.error.2
+(define-eacces-test stat.error.2
   (let* ((dir (merge-pathnames
 	       (make-pathname :directory '(:relative "stat.error.2"))
 	       *test-directory*))
@@ -235,7 +258,12 @@
 	(sb-posix:chmod dir (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec))
 	(sb-posix:unlink file)
 	(sb-posix:rmdir dir)
-	(sb-posix:syscall-errno c))))
+	(sb-posix:syscall-errno c))
+      (:no-error (result)
+	(sb-posix:chmod dir (logior sb-posix::s-iread sb-posix::s-iwrite sb-posix::s-iexec))
+	(sb-posix:unlink file)
+	(sb-posix:rmdir dir)
+	result)))
   #.sb-posix::eacces)
 
 ;;; stat-mode tests
@@ -326,3 +354,28 @@
     (sb-posix:syscall-error (c)
       (sb-posix:syscall-errno c)))
   #.sb-posix::eisdir)
+
+(deftest fcntl.1
+  (let ((fd (sb-posix:open "/dev/null" sb-posix::o-nonblock)))
+    (= (sb-posix:fcntl fd sb-posix::f-getfl) sb-posix::o-nonblock))
+  t)
+
+
+(deftest opendir.1
+  (let ((dir (sb-posix:opendir "/")))
+    (unwind-protect (sb-alien:null-alien dir)
+      (unless (sb-alien:null-alien dir)
+	(sb-posix:closedir dir))))
+  nil)
+
+(deftest readdir.1
+  (let ((dir (sb-posix:opendir "/")))
+    (unwind-protect
+       (block dir-loop
+         (loop for dirent = (sb-posix:readdir dir)
+               until (sb-alien:null-alien dirent)
+               when (not (stringp (sb-posix:dirent-name dirent)))
+                 do (return-from dir-loop nil)
+               finally (return t)))
+      (sb-posix:closedir dir)))
+  t)