luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix tests [skip ci]

Browse source
This commit is contained in:
Michiel Borkent 2021-03-17 13:48:21 +01:00
parent afed99ad1b
commit 9051d3aac7
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/babashka/main.clj
View file

@ -362,7 +362,7 @@ Use -- to separate script command line args from bb command line args.
(defn error [msg exit] (defn error [msg exit]
(binding [*out* *err*] (binding [*out* *err*]
(println msg) (println msg)
{:exec (fn [] exit)})) {:exec (fn [] [nil exit])}))
(defn parse-opts [options] (defn parse-opts [options]
(let [opts (loop [options options (let [opts (loop [options options
@ -515,7 +515,10 @@ Use -- to separate script command line args from bb command line args.
:shell :shell
(let [args (get task :args)] (let [args (get task :args)]
{:exec (fn [] {:exec (fn []
(p/process args {:inherit true}) p/check)}) [nil
(-> (p/process args {:inherit true})
p/check
:exit)])})
:fn :fn
(let [var (get task :var) (let [var (get task :var)
var-sym (symbol var)] var-sym (symbol var)]
@ -708,7 +711,7 @@ Use -- to separate script command line args from bb command line args.
:verbose? verbose? :verbose? verbose?
:preloads preloads :preloads preloads
:loader (:loader @cp/cp-state)})))) :loader (:loader @cp/cp-state)}))))
exec-fn [(exec-fn) 0] exec-fn (exec-fn)
exec-src [(sci/binding [sci/file (or @sci/file "<task: >")] exec-src [(sci/binding [sci/file (or @sci/file "<task: >")]
(sci/eval-string* sci-ctx exec-src)) (sci/eval-string* sci-ctx exec-src))
0] 0]

2
test/babashka/test_utils.clj
View file

@ -10,6 +10,7 @@
(defn bb-jvm [input-or-opts & args] (defn bb-jvm [input-or-opts & args]
(reset! cp/cp-state nil) (reset! cp/cp-state nil)
(reset! main/env {})
(let [os (java.io.StringWriter.) (let [os (java.io.StringWriter.)
es (if-let [err (:err input-or-opts)] es (if-let [err (:err input-or-opts)]
err (java.io.StringWriter.)) err (java.io.StringWriter.))
@ -30,6 +31,7 @@
(if (string? input-or-opts) (if (string? input-or-opts)
(with-in-str input-or-opts (apply main/main args)) (with-in-str input-or-opts (apply main/main args))
(apply main/main args)))] (apply main/main args)))]
;; (prn :err (str es))
(if (zero? res) (if (zero? res)
(str os) (str os)
(throw (ex-info (str es) (throw (ex-info (str es)