X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fuffi-c-test-lib.lisp;h=7481201d49a2670eba33c49662903e5c0697d2a4;hb=3ade95bab16abe09642554e9cbf56f117f01e507;hp=1fd6d16d45ec71c7c59d54956c471dd6dcf3e356;hpb=868ae7fad94b80592524dea37eae1000075605c6;p=uffi.git diff --git a/tests/uffi-c-test-lib.lisp b/tests/uffi-c-test-lib.lisp index 1fd6d16..7481201 100644 --- a/tests/uffi-c-test-lib.lisp +++ b/tests/uffi-c-test-lib.lisp @@ -9,7 +9,7 @@ ;;;; ;;;; $Id$ ;;;; -;;;; This file, part of UFFI, is Copyright (c) 2002-2003 by Kevin M. Rosenberg +;;;; This file, part of UFFI, is Copyright (c) 2002-2005 by Kevin M. Rosenberg ;;;; ;;;; ************************************************************************* @@ -19,7 +19,7 @@ (uffi:def-function ("cs_to_upper" cs-to-upper) ((input (* :unsigned-char))) :returning :void - ) + :module "uffi_tests") (defun string-to-upper (str) (uffi:with-foreign-string (str-foreign str) @@ -28,7 +28,8 @@ (uffi:def-function ("cs_count_upper" cs-count-upper) ((input :cstring)) - :returning :int) + :returning :int + :module "uffi_tests") (defun string-count-upper (str) (uffi:with-cstring (str-cstring str) @@ -36,20 +37,25 @@ (uffi:def-function ("half_double_vector" half-double-vector) ((size :int) - (vec (:array :double))) - :returning :void) + (vec (* :double))) + :returning :void + :module "uffi_tests") (uffi:def-function ("return_long_negative_one" return-long-negative-one) () - :returning :long) + :returning :long + :module "uffi_tests") (uffi:def-function ("return_int_negative_one" return-int-negative-one) () - :returning :int) + :returning :int + :module "uffi_tests") (uffi:def-function ("return_short_negative_one" return-short-negative-one) () - :returning :short) + :returning :short + :module "uffi_tests") + (uffi:def-constant +double-vec-length+ 10) (defun test-half-double-vector () @@ -80,13 +86,13 @@ (half-double-vector +double-vec-length+ (system:vector-sap vec))) vec)) -(deftest c-test.1 (string-to-upper "this is a test") "THIS IS A TEST") -(deftest c-test.2 (string-to-upper nil) nil) -(deftest c-test.3 (string-count-upper "This is a Test") 2) -(deftest c-test.4 (string-count-upper nil) -1) -(deftest c-test.5 (test-half-double-vector) +(deftest :c-test.1 (string-to-upper "this is a test") "THIS IS A TEST") +(deftest :c-test.2 (string-to-upper nil) nil) +(deftest :c-test.3 (string-count-upper "This is a Test") 2) +(deftest :c-test.4 (string-count-upper nil) -1) +(deftest :c-test.5 (test-half-double-vector) (0.0d0 0.5d0 1.0d0 1.5d0 2.0d0 2.5d0 3.0d0 3.5d0 4.0d0 4.5d0)) -(deftest c-test.6 (return-long-negative-one) -1) -(deftest c-test.7 (return-int-negative-one) -1) -(deftest c-test.8 (return-short-negative-one) -1) +(deftest :c-test.6 (return-long-negative-one) -1) +(deftest :c-test.7 (return-int-negative-one) -1) +(deftest :c-test.8 (return-short-negative-one) -1)