Skip to content

Commit 6a1b3c8

Browse files
committed
more windows test debug
1 parent cd3973b commit 6a1b3c8

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@
7777
new-content (stream->string in)
7878
new-content-lower (str/lower-case new-content)
7979
seen (or (get-in state [:append-dedupe path]) #{existing-lower})]
80-
(println "\nconflict-append-dedupe, seen=" seen)
81-
(println "new content:" new-content)
82-
(println "contains:" (contains? seen new-content-lower))
80+
;(println "\nconflict-append-dedupe, seen=" seen)
81+
;(println "new content:" new-content)
82+
;(println "contains:" (contains? seen new-content-lower))
8383
(if (contains? seen new-content-lower)
8484
;; already seen
8585
{:state (assoc-in state [:append-dedupe path] seen)}
@@ -112,6 +112,8 @@
112112
[^FileTime last-modified-time buffer out-dir path write-spec]
113113
(let [{:keys [string stream append] :or {append false}} write-spec
114114
out-file (jio/file out-dir path)]
115+
(when (and append string)
116+
(prn "APPEND" path string))
115117
(if string
116118
(spit out-file string :append ^boolean append)
117119
(copy-stream! ^InputStream stream (BufferedOutputStream. (FileOutputStream. out-file ^boolean append)) buffer))

src/test/clojure/clojure/tools/build/tasks/test_uber.clj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@
207207
(slurp (project-path "target/unzip/META-INF/LICENSE.txt"))))))
208208

209209
(comment
210+
(run-tests)
210211
(test-conflicts-but-files)
211212
)
212213

0 commit comments

Comments
 (0)