X-Git-Url: http://git.kpe.io/?p=clsql.git;a=blobdiff_plain;f=clsql.asd;h=4f009505eed9ef3e3603214f2133f2ea5af69340;hp=5d9adf219577dd1fb0a6f2c36c64eacab78a0c5d;hb=HEAD;hpb=578241e238851ac58c6483b3986e471b7262ccf2

diff --git a/clsql.asd b/clsql.asd
index 5d9adf2..37263ce 100644
--- a/clsql.asd
+++ b/clsql.asd
@@ -54,6 +54,7 @@ oriented interface."
 			 (:file "base-classes" :depends-on ("package"))
                          (:file "conditions" :depends-on ("base-classes"))
                          (:file "db-interface" :depends-on ("conditions"))
+                         (:file "decimals" :depends-on ("package" "db-interface"))
 			 (:file "utils" :depends-on ("package" "db-interface"))
 			 (:file "time" :depends-on ("package" "conditions" "utils"))
                          (:file "generics" :depends-on ("package"))))
@@ -93,15 +94,11 @@ oriented interface."
 				     (:file "generic-odbc")
 				     (:file "sequences")
 				     (:file "command-object"))
-			:depends-on (functional))))))
-
-
-(defmethod perform ((o test-op) (c (eql (find-system 'clsql))))
-  (operate 'load-op 'clsql-tests)
-  (operate 'test-op 'clsql-tests :force t))
+			:depends-on (functional)))))
+    :in-order-to ((test-op (test-op "clsql-tests"))))
 
 (defmethod perform :after ((o load-op) (c (eql (find-system 'clsql))))
-  (let* ((init-var (uffi:getenv "CLSQLINIT"))
+  (let* ((init-var (uffi::getenv "CLSQLINIT"))
          (init-file (or (when init-var (probe-file init-var))
                         (probe-file
                          (concatenate 'string
@@ -111,4 +108,3 @@ oriented interface."
                         #+(or mswin windows win32 win64 mswindows)
                         (probe-file "c:\\etc\\clsql-init.lisp"))))
     (when init-file (load init-file))))
-