From b9eb2d004eba3ba78bcded9472bb2e07e23b7c62 Mon Sep 17 00:00:00 2001 From: Konrad Mrożek <konrad.mrozek@shareablee.com> Date: Mon, 24 Jul 2023 11:27:04 +0000 Subject: [PATCH] Change class cache dir --- compiler/clojure-test.vim | 2 +- clojure/src/test_runner.clj | 23 ++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/clojure/src/test_runner.clj b/clojure/src/test_runner.clj index 209c826..07425c7 100644 --- a/clojure/src/test_runner.clj +++ b/clojure/src/test_runner.clj @@ -1,11 +1,16 @@ -(binding [*compile-files* true] - (require 'clojure.test)) +(ns test-runner) -(ns test-runner - (:require [clojure.test :as t])) +(def class-cache-dir ".cache/classes") +(.mkdirs (java.io.File. class-cache-dir)) -(when-not (.exists (java.io.File. "classes")) - (.. (java.io.File. "classes") mkdir)) +(defmacro with-class-cache [& body] + `(binding [*compile-path* class-cache-dir + *compile-files* true] + ~@body)) + +(with-class-cache + (time + (require '[clojure.test :as t]))) (defmulti vim-report :type) @@ -71,7 +76,7 @@ first)) (defn -main [& {:strs [-test-file -test-line] :or {-test-file "test"}}] - (binding [*compile-files* true] + (with-class-cache (compile 'test-runner) (println "Detecting test files in" -test-file) (let [test-files (->> -test-file @@ -110,7 +115,3 @@ test-namespaces))) 1 0))))))) - - - - diff --git a/compiler/clojure-test.vim b/compiler/clojure-test.vim index 4f5a651..d7c4c02 100644 --- a/compiler/clojure-test.vim +++ b/compiler/clojure-test.vim @@ -9,7 +9,7 @@ command -nargs=* CompilerSet setlocal <args> endif -var clojure_test_deps = "'{:aliases {:clojure-test-vim {:extra-paths [\"classes\"] :extra-deps {mrroman/clojure-test.vim {:local/root \"" .. expand('<sfile>:p:h:h') .. "/clojure\"}}}}}'" +var clojure_test_deps = "'{:aliases {:clojure-test-vim {:extra-paths [\".cache/classes\"] :extra-deps {mrroman/clojure-test.vim {:local/root \"" .. expand('<sfile>:p:h:h') .. "/clojure\"}}}}}'" execute 'CompilerSet makeprg=clojure\ -Sdeps\ ' .. escape(clojure_test_deps, ' \|"') .. '\ -Mtest:clojure-test-vim\ --report\ stderr\ -m\ test-runner\ -test-file' CompilerSet errorformat=%EERROR:%f:%l:%m,%CERROR-CONTINUE:%m,%WFAIL:%f:%l:%m,%CFAIL-CONTINUE:%m -- Gitblit v1.9.3