$ diff -u cffi-tests.asd.orig cffi-tests.asd --- cffi-tests.asd.orig Tue Feb 28 19:09:58 2006 +++ cffi-tests.asd Thu Apr 20 13:05:43 2006 @@ -51,7 +51,7 @@

(defsystem cffi-tests :description "Unit tests for CFFI." - :depends-on (cffi rt) + :depends-on (cffi #-sbcl rt #+sbcl sb-rt) :components ((:module "tests" :serial t @@ -71,7 +71,7 @@ (:file "misc")))))

(defmethod perform ((o test-op) (c (eql (find-system :cffi-tests)))) - (or (funcall (intern (symbol-name '#:do-tests) '#:regression-test)) + (or (funcall (intern (symbol-name '#:do-tests) #-sbcl '#:rt #+sbcl '#:sb-rt)) (error "test-op failed.")))

;;; vim: ft=lisp et

$ diff -u callbacks.lisp.orig callbacks.lisp --- callbacks.lisp.orig Thu Mar 16 11:44:56 2006 +++ callbacks.lisp Thu Apr 20 13:07:23 2006 @@ -144,7 +144,8 @@

#-cffi-features:no-long-long (progn - #+openmcl (push 'callbacks.long-long rt::*expected-failures*) + #+openmcl (push 'callbacks.long-long #-sbcl rt::*expected-failures* + #+sbcl sb-rt::*expected-failures*)

(deftest callbacks.long-long (expect-long-long-sum (callback sum-long-long)) @@ -313,7 +314,8 @@ (reduce #'+ args)))

#+(or openmcl (and cffi-features:darwin (or allegro cmu lispworks))) -(push 'callbacks.bff.1 regression-test::*expected-failures*) +(push 'callbacks.bff.1 #-sbcl rt::*expected-failures* + #+sbcl sb-rt::*expected-failures*)

(deftest callbacks.bff.1 (call-sum-127-no-ll (callback sum-127-no-ll)) @@ -378,7 +380,8 @@ a119 a120 a121 (values (floor a122)) a123 a124 a125 a126 a127))

#+(or openmcl (and cffi-features:darwin cmu)) - (push 'callbacks.bff.2 rt::*expected-failures*) + (push 'callbacks.bff.2 #-sbcl rt::*expected-failures* + #+sbcl sb-rt::*expected-failures*)

(deftest callbacks.bff.2 (call-sum-127 (callback sum-127)) @@ -409,7 +412,8 @@ (defcfun "call_double26" :double (f :pointer))

#+(and cffi-features:darwin allegro) -(pushnew 'callbacks.double26 rt::*expected-failures*) +(pushnew 'callbacks.double26 #-sbcl rt::*expected-failures* + #+sbcl sb-rt::*expected-failures*)

(deftest callbacks.double26 (call-double26 (callback double26)) @@ -445,14 +449,16 @@ (defcfun "call_float26" :float (f :pointer))

#+(and cffi-features:darwin (or lispworks openmcl)) -(pushnew 'callbacks.float26 regression-test::*expected-failures*) +(pushnew 'callbacks.float26 #-sbcl rt::*expected-failures* + #+sbcl sb-rt::*expected-failures*)

(deftest callbacks.float26 (call-float26 (callback float26)) 130.0)

#+(and cffi-features:darwin (or lispworks openmcl)) -(pushnew 'callbacks.float26.funcall regression-test::*expected-failures*) +(pushnew 'callbacks.float26.funcall #-sbcl rt::*expected-failures* + #+sbcl sb-rt::*expected-failures*)

#-cffi-features:no-foreign-funcall (deftest callbacks.float26.funcall

$ diff -u foreign-globals.lisp.orig foreign-globals.lisp --- foreign-globals.lisp.orig Thu Apr 20 12:59:17 2006 +++ foreign-globals.lisp Thu Apr 20 12:58:38 2006 @@ -95,7 +95,8 @@

#-cffi-features:no-long-long (progn - #+openmcl (push 'foreign-globals.set.long-long rt::*expected-failures*) + #+openmcl (push 'foreign-globals.set.long-long #-sbcl rt::*expected-failures* + #+sbcl sb-rt::*expected-failures*)

(deftest foreign-globals.ref.long-long *var-long-long*

$ diff -u memory.lisp.orig memory.lisp --- memory.lisp.orig Sat Feb 25 03:55:08 2006 +++ memory.lisp Thu Apr 20 13:01:58 2006 @@ -78,7 +78,8 @@ #-cffi-features:no-long-long (progn #+(and cffi-features:darwin openmcl) - (pushnew 'deref.long-long rt::*expected-failures*) + (pushnew 'deref.long-long #-sbcl rt::*expected-failures* + #+sbcl sb-rt::*expected-failures*)

(deftest deref.long-long (with-foreign-object (p :long-long) @@ -454,7 +455,8 @@ #-cffi-features:no-long-long (progn #+(and cffi-features:darwin openmcl) - (pushnew 'deref.nonconst.long-long rt::*expected-failures*) + (pushnew 'deref.nonconst.long-long #-sbcl rt::*expected-failures* + #+sbcl sb-rt::*expected-failures*)

(deftest deref.nonconst.long-long (let ((type :long-long))

$ diff -u package.lisp.orig package.lisp --- package.lisp.orig Thu Feb 16 08:34:54 2006 +++ package.lisp Thu Apr 20 13:03:27 2006 @@ -28,5 +28,5 @@ (in-package #:cl-user)

(defpackage #:cffi-tests - (:use #:cl #:cffi #:cffi-sys #:regression-test) + (:use #:cl #:cffi #:cffi-sys #-sbcl #:rt #+sbcl #:sb-rt) (:export #:do-tests))

$ diff -u random-tester.lisp.orig random-tester.lisp --- random-tester.lisp.orig Tue Feb 14 05:14:46 2006 +++ random-tester.lisp Thu Apr 20 13:08:41 2006 @@ -36,7 +36,7 @@ ;;; this code can generate.

(defpackage #:cffi-random-tester - (:use #:cl #:cffi #:regression-test)) + (:use #:cl #:cffi #-sbcl #:rt #+sbcl #:sb-rt)) (in-package #:cffi-random-tester)

(defstruct (c-type (:conc-name type-))