X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Fforeign-loader.lisp;h=f684681e0345fa5226bbbdd52fd84a0b728d0a08;hb=f5e6a5198989a460c4787041830d66fa76ebcdab;hp=cebbeaefaebe640e34dbef91b1078daa181f9e63;hpb=e808a7bbbdb701b208c9e7f2cc75151a847ff3af;p=uffi.git

diff --git a/tests/foreign-loader.lisp b/tests/foreign-loader.lisp
index cebbeae..f684681 100644
--- a/tests/foreign-loader.lisp
+++ b/tests/foreign-loader.lisp
@@ -9,7 +9,7 @@
 ;;;;
 ;;;; $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
 ;;;;
 ;;;; *************************************************************************
 
@@ -18,26 +18,30 @@
 
 (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"))
+         (uffi:find-foreign-library
+          #-(or macosx darwin)
+          "libz"
+          #+(or macosx darwin)
+          "z"
+          (list (pathname-directory #.(or *compile-file-truename* *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
-	  '(#+(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")
+
+#+clisp (uffi:load-foreign-library "/home/kevin/debian/src/uffi/tests/uffi-c-test.so" :module "uffi_tests")
+#-clisp
+(unless (uffi:load-foreign-library
+         (uffi:find-foreign-library
+          '(#+(or 64bit x86-64) "uffi-c-test64" "uffi-c-test")
+          (list (pathname-directory #.(or *compile-file-truename* *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"))