X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fforeign-loader.lisp;h=a4e924a97828755f86b15b1e92e7de5c392ee45f;hb=7599e54026e90011250b3113f9f2276eec162a3c;hp=eea47945833bdec2517ce43ab170e69c089789bb;hpb=cf57d11caa2750f8a1777865f235089ac2a11cfb;p=uffi.git

diff --git a/tests/foreign-loader.lisp b/tests/foreign-loader.lisp
index eea4794..a4e924a 100644
--- a/tests/foreign-loader.lisp
+++ b/tests/foreign-loader.lisp
@@ -7,21 +7,17 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: foreign-loader.lisp,v 1.3 2003/06/26 18:02:08 kevin Exp $
+;;;; $Id: foreign-loader.lisp,v 1.6 2003/08/26 17:27:01 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
-;;;; UFFI users are granted the rights to distribute and use this software
-;;;; as governed by the terms of the Lisp Lesser GNU Public License
-;;;; (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ;;;; *************************************************************************
 
 ;;; For CMUCL, it's necessary to load foreign files separate from their
 ;;; usage
 
-(in-package :uffi-tests)
+(in-package uffi-tests)
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
 (unless (uffi:load-foreign-library
 	 #-(or macosx darwin)
 	 (uffi:find-foreign-library
@@ -29,17 +25,18 @@
 	  '("/usr/local/lib/" "/usr/lib/" "/zlib/")
 	  :types '("so" "a"))
 	 #+(or macosx darwin)
-	 (uffi:find-foreign-library "z"
-				    `(,(pathname-directory *load-pathname*)))
+	 (uffi:find-foreign-library
+	  "z" (list (pathname-directory *load-pathname*)))
 	 :module "zlib" 
 	 :supporting-libraries '("c"))
-  (warn "Unable to load zlib")))
+  (warn "Unable to load zlib"))
   
 (unless (uffi:load-foreign-library 
 	 (uffi:find-foreign-library "uffi-c-test-lib" 
 				    (list
 				     (pathname-directory *load-truename*)
 				     "/usr/lib/uffi/"))
-	 :supporting-libraries '("c"))
+	 :supporting-libraries '("c")
+	 :module "uffi_tests")
   (warn "Unable to load uffi-c-test-lib library"))