X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=examples%2Fc-test-fns.cl;h=0bdb90fda7ec735b10a285c882e225bb8c05a12c;hb=839b3e4b9627ecf5d3b0d8d2910a95d7f9010dc5;hp=45f144dfb3fec093773ba1c274a762f28c851ead;hpb=c55832db4eb5a0535762f291674b3b26d288ad17;p=uffi.git

diff --git a/examples/c-test-fns.cl b/examples/c-test-fns.cl
index 45f144d..0bdb90f 100644
--- a/examples/c-test-fns.cl
+++ b/examples/c-test-fns.cl
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: c-test-fns.cl,v 1.2 2002/03/21 09:54:34 kevin Exp $
+;;;; $Id: c-test-fns.cl,v 1.7 2002/04/03 00:31:32 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -19,9 +19,7 @@
 (in-package :cl-user)
 
 (unless (uffi:load-foreign-library 
-	 (make-pathname :name "c-test-fns" 
-			:type #+(or linux unix)"so" #+(or win32 mswindows) "dll"
-			:defaults *load-truename*)
+	 (uffi:find-foreign-library "c-test-fns" *load-truename*)
 	 :supporting-libraries '("c")
 	 :force-load t)
   (warn "Unable to load c-test-fns library"))
@@ -79,22 +77,45 @@
      (half-double-vector +double-vec-length+ (system:vector-sap vec)))
     vec))
     
-#+test-uffi
+#+examples-uffi
 (format t "~&(string-to-upper \"this is a test\") => ~A" 
 	(string-to-upper "this is a test"))
 
-#+test-uffi
+#+examples-uffi
 (format t "~&(string-to-upper nil) => ~A" 
 	(string-to-upper nil))
 
-#+test-uffi
+#+examples-uffi
 (format t "~&(string-count-upper \"This is a Test\") => ~A" 
 	(string-count-upper "This is a Test"))
 
-#+test-uffi
+#+examples-uffi
 (format t "~&(string-count-upper nil) => ~A" 
 	(string-count-upper nil))
 
-#+test-uffi
+#+examples-uffi
 (format t "~&Half vector: ~S" (test-half-double-vector))
 
+
+
+#+test-uffi
+(progn
+  (util.test:test (string= (string-to-upper "this is a test") "THIS IS A TEST")
+                  t
+		  :test #'eql
+		  :fail-info "Error with string-to-upper")
+  (util.test:test (string-to-upper nil) nil
+		  :fail-info "string-to-upper with nil failed")
+  (util.test:test (string-count-upper "This is a Test")
+		  2
+		  :test #'eql
+		  :fail-info "Error with string-count-upper")
+  (util.test:test (string-count-upper nil) -1
+		  :test #'eql
+		  :fail-info "string-count-upper with nil failed")
+
+  (util.test:test (test-half-double-vector)
+		  '(0.0d0 0.5d0 1.0d0 1.5d0 2.0d0 2.5d0 3.0d0 3.5d0 4.0d0 4.5d0)
+		  :test #'equal
+		  :fail-info "Error comparing half-double-vector")
+  )