From 9ae31ad67fe1c4decfc8a262834085eab8a178db Mon Sep 17 00:00:00 2001
From: Konrad Mrożek <konrad.mrozek@shareablee.com>
Date: Thu, 13 Jul 2023 10:04:37 +0000
Subject: [PATCH] Fix not working tests on folder
---
compiler/clojure-test.vim | 2 +-
clojure/src/test_runner.clj | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/clojure/src/test_runner.clj b/clojure/src/test_runner.clj
index d5b0156..ed5ab46 100644
--- a/clojure/src/test_runner.clj
+++ b/clojure/src/test_runner.clj
@@ -36,13 +36,18 @@
(defmethod emacs-report :default
[_])
-(defn -main [& [test-file]]
+(defn- clj-file? [f]
+ (re-matches #"^.*\.cljs?$" (.getName f)))
+
+(defn -main [& {:strs [-test-file] :or {-test-file "test"}}]
(binding [*compile-files* true]
(compile 'test-runner)
- (let [test-files (->> (or test-file "test")
+ (println "Detecting test files in" -test-file)
+ (let [test-files (->> -test-file
(java.io.File.)
(file-seq)
(filter (memfn isFile))
+ (filter clj-file?)
(map (memfn getAbsolutePath))
(set))]
(println "Loading test files...")
diff --git a/compiler/clojure-test.vim b/compiler/clojure-test.vim
index cfbd123..4f5a651 100644
--- a/compiler/clojure-test.vim
+++ b/compiler/clojure-test.vim
@@ -11,5 +11,5 @@
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\"}}}}}'"
-execute 'CompilerSet makeprg=clojure\ -Sdeps\ ' .. escape(clojure_test_deps, ' \|"') .. '\ -Mtest:clojure-test-vim\ -m\ test-runner'
+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