r4731: Automatic commit for debian_version_1_2_13-1

diff --git a/tests/compress.lisp b/tests/compress.lisp
index c418408191f3b8b69b830874d62ad76f41fb2b04..3a6877434d031a9a358297ba2126e2cc47060262 100644 (file)
--- a/tests/compress.lisp
+++ b/tests/compress.lisp
@@ -2,12 +2,12 @@
 ;;;; *************************************************************************\r
 ;;;; FILE IDENTIFICATION\r
 ;;;;\r
-;;;; Name:          compress.cl\r
+;;;; Name:          compress.lisp\r
 ;;;; Purpose:       UFFI Example file for zlib compression\r
-;;;; Programmer:    Kevin M. Rosenberg\r
+;;;; Author:        Kevin M. Rosenberg\r
 ;;;; Date Started:  Feb 2002\r
 ;;;;\r
-;;;; $Id: compress.lisp,v 1.10 2003/05/02 02:40:52 kevin Exp $\r
+;;;; $Id: compress.lisp,v 1.11 2003/05/02 02:50:12 kevin Exp $\r
 ;;;;\r
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg\r
 ;;;;\r
@@ -18,20 +18,6 @@
 \r
 (in-package :uffi-tests)\r
 \r
-(eval-when (:compile-toplevel :load-toplevel :execute)\r
-(unless (uffi:load-foreign-library\r
-        #-(or macosx darwin)\r
-        (uffi:find-foreign-library\r
-         "libz"\r
-         '("/usr/local/lib/" "/usr/lib/" "/zlib/")\r
-         :types '("so" "a"))\r
-        #+(or macosx darwin)\r
-        (uffi:find-foreign-library "z"\r
-                                   `(,(pathname-directory *load-pathname*)))\r
-        :module "zlib" \r
-        :supporting-libraries '("c"))\r
-  (warn "Unable to load zlib")))\r
-  \r
 (uffi:def-function ("compress" c-compress)\r
     ((dest (* :unsigned-char))\r
      (destlen (* :long))\r

diff --git a/tests/uffi-c-test-lib.lisp b/tests/uffi-c-test-lib.lisp
index 20f4ccb443db01d6aef3de9b06b6afcdf93bb865..eb07ef613a511912c5e4ced0616d68c2f23a28bb 100644 (file)
--- a/tests/uffi-c-test-lib.lisp
+++ b/tests/uffi-c-test-lib.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Mar 2002
 ;;;;
-;;;; $Id: uffi-c-test-lib.lisp,v 1.1 2003/04/29 14:08:02 kevin Exp $
+;;;; $Id: uffi-c-test-lib.lisp,v 1.2 2003/05/02 02:50:12 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -18,12 +18,6 @@
 
 (in-package :uffi-tests)
 
-(unless (uffi:load-foreign-library 
-        (uffi:find-foreign-library "uffi-c-test-lib" 
-                                   (list *load-truename*
-                                         "/usr/lib/"))
-        :supporting-libraries '("c"))
-  (warn "Unable to load uffi-c-test-lib library"))
 
 (uffi:def-function ("cs_to_upper" cs-to-upper)
   ((input (* :unsigned-char)))

diff --git a/uffi-tests.asd b/uffi-tests.asd
index 91af3a5c59aa024919f703d2b8044b3a070a6477..c0b84911d30d250b484a0f80dfc83b9f156fe81c 100644 (file)
--- a/uffi-tests.asd
+++ b/uffi-tests.asd
@@ -7,7 +7,7 @@
 ;;;; Author:        Kevin M. Rosenberg
 ;;;; Date Started:  Apr 2003
 ;;;;
-;;;; $Id: uffi-tests.asd,v 1.6 2003/04/30 14:06:14 kevin Exp $
+;;;; $Id: uffi-tests.asd,v 1.7 2003/05/02 02:50:12 kevin Exp $
 ;;;; *************************************************************************
 
 (defpackage #:uffi-tests-system
@@ -23,13 +23,14 @@
               (:file "package" :depends-on ("rt"))
               (:file "strtol" :depends-on ("package"))
               (:file "atoifl" :depends-on ("package"))
-              (:file "compress" :depends-on ("package"))
               (:file "getenv" :depends-on ("package"))
               (:file "gethostname" :depends-on ("package"))
               (:file "union" :depends-on ("package"))
               (:file "arrays" :depends-on ("package"))
               (:file "time" :depends-on ("package"))
-              (:file "uffi-c-test-lib" :depends-on ("package"))
+              (:file "foreign-loader" :depends-on ("package"))
+              (:file "compress" :depends-on ("foreign-loader"))
+              (:file "uffi-c-test-lib" :depends-on ("foreign-loader"))
               ))))
 
 (defmethod perform ((o test-op) (c (eql (find-system :uffi-tests))))