Skip to content

Commit 36cf482

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

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,13 @@
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" path)
81+
(println "state:" state)
82+
(println "seen:" seen)
83+
(println "existing:" existing-lower)
84+
(println "new content:" new-content-lower)
85+
(println "contains:" (contains? seen new-content-lower))
86+
(println)
8387
(if (contains? seen new-content-lower)
8488
;; already seen
8589
{:state (assoc-in state [:append-dedupe path] seen)}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@
196196
(slurp (project-path "j2/append.txt")))
197197
(slurp (project-path "target/unzip/append.txt"))))
198198

199-
(println "j1: " (slurp (project-path "j1/META-INF/LICENSE.txt")))
200-
(println "j2: " (slurp (project-path "j2/META-INF/LICENSE.txt")))
201-
(println "j3: " (slurp (project-path "j3/META-INF/LICENSE.txt")))
202-
(println "unzip: " (slurp (project-path "target/unzip/META-INF/LICENSE.txt")))
199+
;(println "j1: " (slurp (project-path "j1/META-INF/LICENSE.txt")))
200+
;(println "j2: " (slurp (project-path "j2/META-INF/LICENSE.txt")))
201+
;(println "j3: " (slurp (project-path "j3/META-INF/LICENSE.txt")))
202+
;(println "unzip: " (slurp (project-path "target/unzip/META-INF/LICENSE.txt")))
203203

204204
;; LICENSE files append but no dupes - include j1 and j2, but not j3 (dupe of j1)
205205
(is (= (str (slurp (project-path "j1/META-INF/LICENSE.txt")) (System/lineSeparator)

0 commit comments

Comments
 (0)