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 a4e924a97828755f86b15b1e92e7de5c392ee45f..ab0d6a28b7e6d9b1bb619eb2d74c186097dc0886 100644 (file)
--- a/tests/foreign-loader.lisp
+++ b/tests/foreign-loader.lisp
@@ -7,9 +7,9 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: foreign-loader.lisp,v 1.6 2003/08/26 17:27:01 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
 ;;;;
 ;;;; *************************************************************************
 
@@ -19,24 +19,25 @@
 (in-package uffi-tests)
 
 (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" (list (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"))
   
 (unless (uffi:load-foreign-library 
-        (uffi:find-foreign-library "uffi-c-test-lib" 
-                                   (list
-                                    (pathname-directory *load-truename*)
-                                    "/usr/lib/uffi/"))
+        (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-lib library"))
+  (warn "Unable to load uffi-c-test library"))