From 99b1627bfa79f8f3b0d368e2c67185a91d778f5f Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Sat, 1 Jun 2024 10:41:28 +0200 Subject: [PATCH] get paths to test files (config and database) from source code path --- test/config-sqlite.lisp | 5 +++-- test/test-storage.lisp | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/config-sqlite.lisp b/test/config-sqlite.lisp index 00c5323..1919ae8 100644 --- a/test/config-sqlite.lisp +++ b/test/config-sqlite.lisp @@ -2,10 +2,11 @@ ;;; use: `(load "test/...")` from package scopes/test-storage (defparameter db-config-sqlite - '(:backend :dbi + `(:backend :dbi :db-type :sqlite3 :connect-args - (:database-name "test/test.db") + (:database-name + ,(str:concat (namestring (asdf:system-source-directory :scopes)) "test/test.db")) :options nil)) (setf scopes/test-storage:*db-config-test* db-config-sqlite) diff --git a/test/test-storage.lisp b/test/test-storage.lisp index 5d8f875..b46119f 100644 --- a/test/test-storage.lisp +++ b/test/test-storage.lisp @@ -14,19 +14,21 @@ (in-package :scopes/test-storage) (defparameter *db-config-test* nil) +(defparameter *config-source* + (str:concat (namestring (asdf:system-source-directory :scopes)) "test/config-")) (defun run-all () (run-sqlite) (run-postgres)) (defun run-sqlite () - (load "test/config-sqlite") + (load (str:concat *config-source* "sqlite")) (let ((storage:*db-config* *db-config-test*) (t:*test-suite* (t:test-suite "sqlite"))) (run))) (defun run-postgres () - (load "test/config-postgres") + (load (str:concat *config-source* "postgres")) (let ((storage:*db-config* *db-config-test*) (t:*test-suite* (t:test-suite "postgres"))) (run)))