r10608: update license

[uffi.git] / tests / foreign-var.lisp

diff --git a/tests/foreign-var.lisp b/tests/foreign-var.lisp
index 52bceb159221330f1d5e03eaaaf1f8cb7133da4e..1276f2a50119c644cd2f77a69ad9af08b7850bdc 100644 (file)
--- a/tests/foreign-var.lisp
+++ b/tests/foreign-var.lisp
@@ -4,11 +4,13 @@
 ;;;;
 ;;;; Name:          foreign-var
 ;;;; Purpose:       Tests of foreign variables
-;;;; Programmer:    Kevin M. Rosenberg
+;;;; Authors:       Kevin M. Rosenberg and Edi Weitz
 ;;;; Date Started:  Aug 2003
 ;;;;
-;;;; $Id: foreign-var.lisp,v 1.3 2003/08/15 02:34:34 kevin Exp $
+;;;; $Id$
 ;;;;
+;;;; This file, part of UFFI, is Copyright (c) 2003-2005 by Kevin M. Rosenberg
+;;;
 ;;;; *************************************************************************
 
 (in-package #:uffi-tests)
@@ -22,15 +24,14 @@
 (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")
 
@@ -51,14 +52,14 @@
     :returning :double
     :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*
+(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)
+(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)
 
@@ -78,5 +79,10 @@
        (setf *fvar-addend* orig)))
   48)
 
-;;(decf (uffi:get-slot-value *fvar-struct* 'fvar-struct 'i) 10)
-;;(deftest fvarst.8 (fvar-struct-int) 38)
+(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)))
+  35)