X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftime.lisp;h=9d9546364243e08e53deb1d7409f8e304efae311;hb=3ade95bab16abe09642554e9cbf56f117f01e507;hp=24a3af205c0d9483497a687a106db3049d37d3f1;hpb=8085d5edf101e4f8a00834fc45783ad37d694e42;p=uffi.git

diff --git a/tests/time.lisp b/tests/time.lisp
index 24a3af2..9d95463 100644
--- a/tests/time.lisp
+++ b/tests/time.lisp
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; $Id$
 ;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg
 ;;;;
 ;;;; *************************************************************************
 
@@ -26,7 +26,9 @@
   (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)))
@@ -34,32 +36,32 @@
 
 (uffi:def-function "gmtime"
     ((time (* time-t)))
-  :returning (* tm))
+  :returning (:struct-pointer tm))
 
 (uffi:def-function "asctime"
-    ((time (* tm)))
+    ((time (:struct-pointer tm)))
   :returning :cstring)
 
 (uffi:def-type time-t :unsigned-long)
-(uffi:def-type tm-pointer (* tm))
+(uffi:def-type tm-pointer (:struct-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 (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)
 
 
@@ -84,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))
@@ -103,6 +105,6 @@
       (setf (uffi:deref-pointer time :unsigned-long) secs)
       (asctime (gmtime time))))))
 
-(deftest time.3
+(deftest :time.3
     (posix-time-to-asctime 0)
   "Thu Jan  1 00:00:00 1970")