Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Change name of shlib on freebsd; fix test [bug20102]

FreeBSD changes the name of this library more than other
platforms, which seem to keep it at .1, for the most part.
This value of libz.so.3 good for FreeBSD 6.1, but will need to change
for later versions, no doubt.

Change-Id: Ief643ddf8a65701927f1032b3fe279b8e10d5374
  • Loading branch information...
commit 4bb325b8f2629c0979e4747756aa167fa9c890c8 1 parent 2a98008
@dklayer dklayer authored
Showing with 15 additions and 2 deletions.
  1. +6 −1 deflate.cl
  2. +9 −1 t-gzip.cl
View
7 deflate.cl
@@ -75,7 +75,12 @@ v1: load zlib.so.1 instead of zlib.so."
;; but it would be called this if there were one.
"zlib1.dll")
((:macosx86 :macosx86-64) "libz.1.dylib")
- (:freebsd "libz.so.5")
+ (:freebsd
+ ;; FreeBSD changes the name of this library more than other
+ ;; platforms, which seem to keep it at .1, for the most part.
+ ;; This value is good for FreeBSD 6.1, but will need to change for
+ ;; later versions, no doubt.
+ "libz.so.3")
(t (util.string:string+ "libz." sys::*dll-type* ".1"))))
)
View
10 t-gzip.cl
@@ -71,6 +71,14 @@
(when temp-file2 (ignore-errors (delete-file temp-file2)))))))
(defun test-gzip ()
- (map-over-directory (lambda (p) (deflate-test p)) "./" :recurse nil))
+ (map-over-directory
+ (lambda (p)
+ ;; Don't check .out files, since the output of the tests themselves
+ ;; might be going to one, and that means the files would be changing
+ ;; and the tests will fail.
+ (when (not (string-equal "out" (pathname-type p)))
+ (deflate-test p)))
+ "./"
+ :recurse nil))
(when *do-test* (do-test "gzip" #'test-gzip))
Please sign in to comment.
Something went wrong with that request. Please try again.