X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fforeign-var.lisp;h=fda7c10d86b62c8e76bdbebe9cf9692c78545789;hb=a3db800bfa385ae39d729ef0eb8f08a78ceaccdb;hp=9409eeaf476fc7428c7b8ed8c152e289bcd1714f;hpb=7004c2691d5695471c7bce9d62b82a1914cf05a2;p=uffi.git

diff --git a/tests/foreign-var.lisp b/tests/foreign-var.lisp
index 9409eea..fda7c10 100644
--- a/tests/foreign-var.lisp
+++ b/tests/foreign-var.lisp
@@ -7,7 +7,7 @@
 ;;;; Authors:       Kevin M. Rosenberg and Edi Weitz
 ;;;; Date Started:  Aug 2003
 ;;;;
-;;;; $Id$
+;;;; This file, part of UFFI, is Copyright (c) 2003-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; *************************************************************************
 
@@ -22,66 +22,65 @@
 (def-foreign-var "float_neg_4_5" :float "uffi_tests")
 (def-foreign-var "double_3_1" :double "uffi_tests")
 
-(deftest fvar.1 uchar-13 13)
-(deftest fvar.2 schar-neg-120 -120)
-(deftest fvar.3 uword-257 257)
-(deftest fvar.4 sword-neg-321 -321)
-(deftest fvar.5 uint-1234567 1234567)
-(deftest fvar.6 sint-neg-123456 -123456)
-(deftest fvar.7 float-neg-4-5 -4.5f0)
-(deftest fvar.8 double-3-1 3.1d0)
-
+(deftest :fvar.1 uchar-13 13)
+(deftest :fvar.2 schar-neg-120 -120)
+(deftest :fvar.3 uword-257 257)
+(deftest :fvar.4 sword-neg-321 -321)
+(deftest :fvar.5 uint-1234567 1234567)
+(deftest :fvar.6 sint-neg-123456 -123456)
+(deftest :fvar.7 float-neg-4-5 -4.5f0)
+(deftest :fvar.8 double-3-1 3.1d0)
 
 (uffi:def-foreign-var ("fvar_addend" *fvar-addend*) :int "uffi_tests")
 
 (uffi:def-struct fvar-struct
     (i :int)
   (d :double))
- 
+
 (uffi:def-foreign-var ("fvar_struct" *fvar-struct*) fvar-struct
-  "c-uffi-tests")
+  "uffi_tests")
 
 (uffi:def-function ("fvar_struct_int" fvar-struct-int)
     ()
   :returning :int
-  :module "c-uffi-test")
- 
+  :module "uffi_tests")
+
   (uffi:def-function ("fvar_struct_double" fvar-struct-double)
       ()
     :returning :double
-    :module "c-uffi-test")
- 
-(deftest fvarst.1 *fvar-addend* 3)
-(deftest fvarst.2 (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i) 42)
-(deftest fvarst.3 (= (+ *fvar-addend*
-			(uffi:get-slot-value *fvar-struct* 'fvar-struct 'i))
-		     (fvar-struct-int))
+    :module "uffi_tests")
+
+(deftest :fvarst.1 *fvar-addend* 3)
+(deftest :fvarst.2 (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i) 42)
+(deftest :fvarst.3 (= (+ *fvar-addend*
+                        (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i))
+                     (fvar-struct-int))
   t)
-(deftest fvarst.4 (uffi:get-slot-value *fvar-struct* 'fvar-struct 'd) 3.2d0)
-(deftest fvarst.5 (= (uffi:get-slot-value *fvar-struct* 'fvar-struct 'd)
-		     (fvar-struct-double))
+(deftest :fvarst.4 (uffi:get-slot-value *fvar-struct* 'fvar-struct 'd) 3.2d0)
+(deftest :fvarst.5 (= (uffi:get-slot-value *fvar-struct* 'fvar-struct 'd)
+                     (fvar-struct-double))
   t)
 
-(deftest fvarst.6 
+(deftest :fvarst.6
     (let ((orig *fvar-addend*))
       (incf *fvar-addend* 3)
       (prog1
-	  *fvar-addend*
-	(setf *fvar-addend* orig)))
+          *fvar-addend*
+        (setf *fvar-addend* orig)))
   6)
 
-(deftest fvarst.7 
+(deftest :fvarst.7
     (let ((orig *fvar-addend*))
       (incf *fvar-addend* 3)
       (prog1
-	  (fvar-struct-int)
-	(setf *fvar-addend* orig)))
+          (fvar-struct-int)
+        (setf *fvar-addend* orig)))
   48)
 
-(deftest fvarst.8 
+(deftest :fvarst.8
     (let ((orig (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i)))
       (decf (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i) 10)
       (prog1
-	  (fvar-struct-int)
-	(setf (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i) orig)))
+          (fvar-struct-int)
+        (setf (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i) orig)))
   35)