diff --git a/deps.clj b/deps.clj index e25d6f64..d85b9aac 160000 --- a/deps.clj +++ b/deps.clj @@ -1 +1 @@ -Subproject commit e25d6f6498cfed9474ec44d568f7131d2aa0cc63 +Subproject commit d85b9aac2fe750ec75fd611842ddf055b64bb933 diff --git a/test/babashka/deps_test.clj b/test/babashka/deps_test.clj index a461fb7b..e7c9719e 100644 --- a/test/babashka/deps_test.clj +++ b/test/babashka/deps_test.clj @@ -57,7 +57,7 @@ true ")))) (is (true? (bb " (= 5 (:exit @(babashka.deps/clojure [] {:in \"(System/exit 5)\" :out :string})))"))) - #_(testing "start from other directory" + (testing "start from other directory" (is (= {1 {:id 1}, 2 {:id 2}} (edn/read-string (bb " (:out @(babashka.deps/clojure [\"-M\" \"-e\" \"(require 'medley.core) (medley.core/index-by :id [{:id 1} {:id 2}])\"] {:out :string :dir \"test-resources/clojure-dir-test\"}))")))))) diff --git a/test/babashka/test_utils.clj b/test/babashka/test_utils.clj index 9fac05a3..8f9a75b2 100644 --- a/test/babashka/test_utils.clj +++ b/test/babashka/test_utils.clj @@ -31,11 +31,12 @@ (println)) (defmethod clojure.test/report :end-test-var [_m] - (let [{:keys [:fail :error]} @*report-counters*] - (when (and (= "true" (System/getenv "BABASHKA_FAIL_FAST")) - (or (pos? fail) (pos? error))) - (println "=== Failing fast") - (System/exit 1)))) + (when-let [rc *report-counters*] + (let [{:keys [:fail :error]} @rc] + (when (and (= "true" (System/getenv "BABASHKA_FAIL_FAST")) + (or (pos? fail) (pos? error))) + (println "=== Failing fast") + (System/exit 1))))) (defn bb-jvm [input-or-opts & args] (reset! cp/cp-state nil)