Skip to content

Commit fafd794

Browse files
NoahTheDukepuredanger
authored andcommitted
TBUILD-46: Capture out and err if process is unsuccessful
1 parent 2d2f1b0 commit fafd794

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/main/clojure/clojure/tools/build/tasks/compile_clj.clj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,16 @@
106106
:main-args [(.getCanonicalPath compile-script)]}))
107107
(select-keys params [:out :err :out-file :err-file]))
108108
_ (spit (jio/file working-dir "compile.args") (str/join " " (:command-args process-args)))
109-
{exit :exit, ps-out :out, ps-err :err} (process/process process-args)]
109+
{exit :exit, ps-out :out, ps-err :err} (process/process process-args)
110+
ret (cond-> nil
111+
ps-out (assoc :out ps-out)
112+
ps-err (assoc :err ps-err))]
110113
(if (zero? exit)
111114
(do
112115
(if (seq filter-nses)
113116
(file/copy-contents working-compile-dir compile-dir-file (map ns->path filter-nses))
114117
(file/copy-contents working-compile-dir compile-dir-file))
115118
;; only delete on success, otherwise leave the evidence!
116119
(file/delete working-dir)
117-
(cond-> nil
118-
ps-out (assoc :out ps-out)
119-
ps-err (assoc :err ps-err)))
120-
(throw (ex-info (str "Clojure compilation failed, working dir preserved: " (.toString working-dir)) {})))))
120+
ret)
121+
(throw (ex-info (str "Clojure compilation failed, working dir preserved: " (.toString working-dir)) ret)))))

0 commit comments

Comments
 (0)