X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi-tests.asd;h=18af90b1606e3b113ef9af4e258a78688f3499eb;hb=a90b2382e88626ea8ac6a0e470fdb515f0351a0a;hp=6f2c4bfc7c129149caaaf776c756afc6f6d583cb;hpb=3d2a4046b6f2c0da8065606ed96b4444ced59205;p=uffi.git

diff --git a/uffi-tests.asd b/uffi-tests.asd
index 6f2c4bf..18af90b 100644
--- a/uffi-tests.asd
+++ b/uffi-tests.asd
@@ -15,40 +15,33 @@
 (in-package #:uffi-tests-system)
 
 (defvar *asd-file-dir* (pathname-directory *load-truename*))
+(defvar *library-file-dir* (append *asd-file-dir* "tests"))
 
 (defclass uffi-test-source-file (c-source-file)
   ())
 
 (defmethod output-files ((o compile-op) (c uffi-test-source-file))
-  (let ((searched (or
-		   (probe-file #p"/usr/lib/uffi/uffi-c-test.so")
-		   (probe-file (make-pathname
-				:directory *asd-file-dir*
-				:name "uffi-c-test"
-				:type "so")))))
-    (if searched
+  (let ((found (some #'(lambda (dir)
+			    (probe-file (make-pathname :directory d
+						       :name (component-name c)
+						       :type "so")))
+			'((:absolute "usr" "lib" "uffi")
+			  *asd-file-dir*))))
+    (if found
 	(list searched)
-	(list (merge-pathnames
-	       (make-pathname :name (component-name c)
-			      :type "so"
-			      :directory '(:relative "tests"))
-	       (make-pathname :directory *asd-file-dir*))))))
+	(list (make-pathname :name (component-name c)
+			     :type "so"
+			     :directory *library-file-dir*)))))
 
 (defmethod perform ((o load-op) (c uffi-test-source-file))
-  (dolist (f (asdf::input-files o c))
-    (funcall (intern (symbol-name '#:load-foreign-library)
-		     (symbol-name '#:uffi))
-	     f :module "uffi_tests")))
+  nil) ;; lisp loader file will load library
 
 (defmethod perform ((o compile-op) (c uffi-test-source-file))
-  (unless (zerop (run-shell-command "cd ~A; make"
-				    (namestring (merge-pathnames
-						 (make-pathname
-						  :name nil
-						  :type nil
-						  :directory '(:relative "tests"))
-						 (make-pathname
-						  :directory *asd-file-dir*)))))
+  (unless (zerop (run-shell-command
+		  "cd ~A; make"
+		  (namestring (make-pathname :name nil
+					     :type nil
+					     :directory *library-file-dir*))))
     (error 'operation-error :component c :operation o)))