diff --git a/deps.edn b/deps.edn index b88a7ba7..3dd253d6 100644 --- a/deps.edn +++ b/deps.edn @@ -138,7 +138,10 @@ com.github.seancorfield/expectations {:mvn/version "2.0.157"} com.rpl/specter {:mvn/version "1.1.4"} com.github.askonomm/clarktown {:mvn/version "1.1.2"} - org.clojure/math.numeric-tower {:git/tag "math.numeric-tower-0.0.5", :git/sha "12eb9c5", :git/url "https://github.com/clojure/math.numeric-tower"}} + org.clojure/math.numeric-tower {:git/tag "math.numeric-tower-0.0.5", :git/sha "12eb9c5", :git/url "https://github.com/clojure/math.numeric-tower"} + prismatic/schema {:git/url "https://github.com/plumatic/schema" + :git/sha "6846dc7c3a9df5bfd718f68f183c683ce0f621ff" + :git/tag "schema-1.3.0"}} :classpath-overrides {org.clojure/clojure nil org.clojure/spec.alpha nil}} :clj-nvd diff --git a/test-resources/lib_tests/babashka/run_all_libtests.clj b/test-resources/lib_tests/babashka/run_all_libtests.clj index 56fcda74..72c9d8fb 100644 --- a/test-resources/lib_tests/babashka/run_all_libtests.clj +++ b/test-resources/lib_tests/babashka/run_all_libtests.clj @@ -1,5 +1,7 @@ (ns babashka.run-all-libtests - (:require [babashka.core :refer [windows?]] + (:require [babashka.classpath :as cp :refer [add-classpath]] + [babashka.core :refer [windows?]] + [babashka.fs :as fs] [clojure.edn :as edn] [clojure.java.io :as io] [clojure.test :as t :refer [*report-counters*]])) @@ -42,7 +44,13 @@ ;; Standard test-runner for libtests (let [lib-tests (edn/read-string (slurp (io/resource "bb-tested-libs.edn")))] - (doseq [{tns :test-namespaces skip-windows :skip-windows} (vals lib-tests)] + (doseq [[libname {tns :test-namespaces skip-windows :skip-windows + :keys [test-paths + git-sha]}] lib-tests] + (let [git-dir (format ".gitlibs/libs/%s/%s" libname git-sha) + git-dir (fs/file (fs/home) git-dir)] + (doseq [p test-paths] + (add-classpath (str (fs/file git-dir p))))) (when-not (and skip-windows (windows?)) (apply test-namespaces tns)))) diff --git a/test-resources/lib_tests/bb-tested-libs.edn b/test-resources/lib_tests/bb-tested-libs.edn index 9cd8076e..7c46100b 100644 --- a/test-resources/lib_tests/bb-tested-libs.edn +++ b/test-resources/lib_tests/bb-tested-libs.edn @@ -114,4 +114,15 @@ com.rpl/specter {:git-url "https://github.com/redplanetlabs/specter", :test-namespaces (com.rpl.specter.cljs-test-helpers com.rpl.specter.test-helpers com.rpl.specter.core-test com.rpl.specter.zipper-test), :git-sha "67e86806020b9d02fbca8cdb1efad3002fc81a32"} com.github.askonomm/clarktown {:git-url "https://github.com/askonomm/clarktown", :test-namespaces (clarktown.core-test clarktown.parsers.horizontal-line-block-test clarktown.parsers.italic-test clarktown.parsers.link-and-image-test clarktown.parsers.empty-block-test clarktown.parsers.inline-code-test clarktown.parsers.heading-block-test clarktown.parsers.bold-test clarktown.parsers.quote-block-test clarktown.parsers.code-block-test clarktown.parsers.strikethrough-test), :git-sha "059bfa7bd9bfdde0c75646bf1dfc20d23da8a02c"} org.clojure/math.numeric-tower {:git-url "https://github.com/clojure/math.numeric-tower", :test-namespaces (clojure.math.test-numeric-tower), :git-sha "97827be66f35feebc3c89ba81c546fef4adc7947"} + prismatic/schema {:test-namespaces [schema.core-test + schema.macros-test + schema.coerce-test + schema.experimental.abstract-map-test + schema.test-test + schema.utils-test] + :git-url "https://github.com/plumatic/schema" + :git-sha "6846dc7c3a9df5bfd718f68f183c683ce0f621ff" + :git-tag "schema-1.3.0" + ;; specify for adding tests to classpath + :test-paths ["test/clj" "test/cljc"]} }