r10830: Automated commit for Debian build of uffi upstream-version-1.5.6

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

diff --git a/tests/foreign-loader.lisp b/tests/foreign-loader.lisp
index 9351fb76b7571e16346c0a43a512b13b5a9647ab..ab0d6a28b7e6d9b1bb619eb2d74c186097dc0886 100644 (file)
--- a/tests/foreign-loader.lisp
+++ b/tests/foreign-loader.lisp
@@ -7,38 +7,37 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: foreign-loader.lisp,v 1.2 2003/05/05 14:56:46 kevin Exp $
+;;;; $Id$
 ;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2005 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
+         #-(or macosx darwin)
          "libz"
-         '("/usr/local/lib/" "/usr/lib/" "/zlib/")
-         :types '("so" "a"))
-        #+(or macosx darwin)
-        (uffi:find-foreign-library "z"
-                                   `(,(pathname-directory *load-pathname*)))
+         #+(or macosx darwin)
+         "z"
+         (list (pathname-directory *load-pathname*)
+               "/usr/local/lib/" #+(or 64bit x86-64) "/usr/lib64/"
+               "/usr/lib/" "/zlib/"))
         :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 *load-truename*
-                                         "/usr/lib/uffi/"))
-        :supporting-libraries '("c"))
-  (warn "Unable to load uffi-c-test-lib library"))
+        (uffi:find-foreign-library
+         '(#+(or 64bit x86-64) "uffi-c-test64" "uffi-c-test") 
+         (list (pathname-directory *load-truename*)
+               "/usr/lib/uffi/"
+               "/home/kevin/debian/src/uffi/tests/"))
+        :supporting-libraries '("c")
+        :module "uffi_tests")
+  (warn "Unable to load uffi-c-test library"))