X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fforeign-loader.lisp;h=017fbedee1ac3d081dcfbba83f2d5f61736df384;hb=27073cc090c29aa5dcf9ed9becdf3e73b937b0bb;hp=4cd8441d81c190eb34a1a0623f0024c3eb94482b;hpb=db166e2970e1aaabd611e243eb899ae4d2f5f5ff;p=uffi.git

diff --git a/tests/foreign-loader.lisp b/tests/foreign-loader.lisp
index 4cd8441..017fbed 100644
--- a/tests/foreign-loader.lisp
+++ b/tests/foreign-loader.lisp
@@ -7,37 +7,39 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: foreign-loader.lisp,v 1.5 2003/08/14 21:40:13 kevin Exp $
-;;;;
-;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
+;;;; This file, part of UFFI, is Copyright (c) 2002-2010 by Kevin M. Rosenberg
 ;;;;
 ;;;; *************************************************************************
 
 ;;; For CMUCL, it's necessary to load foreign files separate from their
 ;;; usage
 
-(in-package #:uffi-tests)
+(in-package uffi-tests)
+
+#+clisp (uffi:load-foreign-library "/usr/lib/libz.so" :module "z")
+#-clisp
+(unless (uffi:load-foreign-library
+         (uffi:find-foreign-library
+          #-(or macosx darwin)
+          "libz"
+          #+(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"))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
+#+clisp (uffi:load-foreign-library "/home/kevin/debian/src/uffi/tests/uffi-c-test.so" :module "uffi_tests")
+#-clisp
 (unless (uffi:load-foreign-library
-	 #-(or macosx darwin)
-	 (uffi:find-foreign-library
-	  "libz"
-	  '("/usr/local/lib/" "/usr/lib/" "/zlib/")
-	  :types '("so" "a"))
-	 #+(or macosx darwin)
-	 (uffi:find-foreign-library "z"
-				    `(,(pathname-directory *load-pathname*)))
-	 :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/"))
-	 :supporting-libraries '("c")
-	 :module "uffi_tests")
-  (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"))