X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftime.lisp;h=89382a86a1efca4345c04a6bed19eaa063ae8222;hb=bbe3653207a655c6fc596474e75092fd0affd0bd;hp=aeedba089c3f813bcf1f194fe435c29dd2832e4f;hpb=9182d38fa370338052a1f26f204decb0e5363593;p=uffi.git

diff --git a/tests/time.lisp b/tests/time.lisp
index aeedba0..89382a8 100644
--- a/tests/time.lisp
+++ b/tests/time.lisp
@@ -26,36 +26,42 @@
   (year :int)
   (wday :int)
   (yday :int)
-  (isdst :int))
+  (isdst :int)
+  ;; gmoffset present on SusE SLES9
+  (gmoffset :long))
 
 (uffi:def-function ("time" c-time) 
     ((time (* time-t)))
   :returning time-t)
 
-(uffi:def-function ("gmtime" c-gmtime)
+(uffi:def-function "gmtime"
     ((time (* time-t)))
-  :returning (* tm))
+  :returning (:struct-pointer tm))
+
+(uffi:def-function "asctime"
+    ((time (:struct-pointer tm)))
+  :returning :cstring)
 
 (uffi:def-type time-t :unsigned-long)
 (uffi:def-type tm-pointer (* tm))
 
-(deftest time.1
+(deftest :time.1
    (uffi:with-foreign-object (time 'time-t)
      (setf (uffi:deref-pointer time :unsigned-long) 7381)
      (uffi:deref-pointer time :unsigned-long))
   7381)
 
-(deftest time.2
-   (uffi:with-foreign-object (time 'time-t)
-     (setf (uffi:deref-pointer time :unsigned-long) 7381)
-     (let ((tm-ptr (the tm-pointer (c-gmtime time))))
-       (values (1+ (uffi:get-slot-value tm-ptr 'tm 'mon))
-	       (uffi:get-slot-value tm-ptr 'tm 'mday)
-	       (+ 1900 (uffi:get-slot-value tm-ptr 'tm 'year))
-	       (uffi:get-slot-value tm-ptr 'tm 'hour)
-	       (uffi:get-slot-value tm-ptr 'tm 'min)
-	       (uffi:get-slot-value tm-ptr 'tm 'sec)
-	       )))
+(deftest :time.2
+  (uffi:with-foreign-object (time 'time-t)
+    (setf (uffi:deref-pointer time :unsigned-long) 7381)
+    (let ((tm-ptr (the tm-pointer (gmtime time))))
+      (values (1+ (uffi:get-slot-value tm-ptr 'tm 'mon))
+	      (uffi:get-slot-value tm-ptr 'tm 'mday)
+	      (+ 1900 (uffi:get-slot-value tm-ptr 'tm 'year))
+	      (uffi:get-slot-value tm-ptr 'tm 'hour)
+	      (uffi:get-slot-value tm-ptr 'tm 'min)
+	      (uffi:get-slot-value tm-ptr 'tm 'sec)
+	      )))
   1 1 1970 2 3 1)
 
 
@@ -80,7 +86,7 @@
 	  (uffi:get-slot-value tv 'timeval 'usecs))
        res))))
 
-(deftest timeofday.1
+(deftest :timeofday.1
     (multiple-value-bind (t1 res1) (get-utime)
       (multiple-value-bind (t2 res2) (get-utime)
 	(and (or (= t2 t1) (> t2 t1))
@@ -90,13 +96,15 @@
 	     (zerop res2))))
   t)
 	     
-(defun posix-time-to-localtime-string (secs)
+(defun posix-time-to-asctime (secs)
   "Converts number of seconds elapsed since 00:00:00 on January 1, 1970, Coordinated Universal Time (UTC)"
   (string-right-trim
    '(#\newline #\return)
    (uffi:convert-from-cstring
     (uffi:with-foreign-object (time 'time-t)
-			      (setf (uffi:deref-pointer time :unsigned-long)
-				    secs)
-			      (c-time time)))))
+      (setf (uffi:deref-pointer time :unsigned-long) secs)
+      (asctime (gmtime time))))))
 
+(deftest :time.3
+    (posix-time-to-asctime 0)
+  "Thu Jan  1 00:00:00 1970")