X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=tests%2Ftest-init.lisp;h=4a83cf9cd28a3950089d91ce8ff581e93a911ab0;hb=78da4831fd20e83f64c74fd6140ed6e8ee73a495;hp=c428467f1882bb4aa49cb5797727d94e332e35ae;hpb=9b248752b3d64b8828ea05a96e168d42ea980518;p=clsql.git diff --git a/tests/test-init.lisp b/tests/test-init.lisp index c428467..4a83cf9 100644 --- a/tests/test-init.lisp +++ b/tests/test-init.lisp @@ -26,6 +26,8 @@ (defvar *rt-oodml*) (defvar *rt-syntax*) (defvar *rt-time*) +;; Below must be set as nil since test-i18n.lisp is not loaded on all platforms. +(defvar *rt-i18n* nil) (defvar *test-database-type* nil) (defvar *test-database-underlying-type* nil) @@ -61,12 +63,16 @@ (setf *test-database-underlying-type* (clsql-sys:database-underlying-type *default-database*)) + ;; If Postgres, turn off notices to console + (when (eql db-type :postgresql) + (clsql:execute-command "SET client_min_messages = WARNING")) + *default-database*) (defun default-suites () "The default list of tests to run." (append *rt-internal* *rt-connection* *rt-basic* *rt-fddl* *rt-fdml* - *rt-ooddl* *rt-oodml* *rt-syntax* *rt-time*)) + *rt-ooddl* *rt-oodml* *rt-syntax* *rt-time* *rt-i18n*)) (defvar *error-count* 0) @@ -281,19 +287,20 @@ (clsql-sys:in test :fdml/select/9)) (push (cons test "mssql uses integer math for AVG.") skip-tests)) ((and (not (member *test-database-underlying-type* - '(:postgresql :mysql :sqlite3))) + '(:postgresql :mysql :sqlite3 ))) (clsql-sys:in test :fdml/select/37 :fdml/select/38)) (push (cons test "LIMIT keyword not supported in SELECT.") skip-tests)) ((and (not (clsql-sys:db-type-has-auto-increment? db-underlying-type)) (clsql-sys:in test :oodml/select/12 :oodml/select/13 :oodml/select/14 :oodml/select/15 :oodml/select/16 :oodml/select/17 :oodml/select/18 :oodml/select/19 :oodml/select/20 - :oodml/select/21 :oodml/select/22 + :oodml/select/21 :oodml/select/22 :oodml/select/23 :oodml/update-records/4 :oodml/update-records/4-slots :oodml/update-records/5 :oodml/update-records/5-slots :oodml/update-records/6 :oodml/update-records/7 :oodml/update-records/8 :oodml/update-records/9 - :oodml/update-records/9-slots :oodml/update-instance/3 + :oodml/update-records/9-slots :oodml/update-records/10 + :oodml/update-records/11 :oodml/update-instance/3 :oodml/update-instance/4 :oodml/update-instance/5 :oodml/update-instance/6 :oodml/update-instance/7 :oodml/db-auto-sync/3 :oodml/db-auto-sync/4))