more windows test debug

clojure · Aug 11, 2023 · a0a01cf · a0a01cf
1 parent 36cf482
commit a0a01cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/clojure/clojure/tools/build/tasks/uber.clj b/src/main/clojure/clojure/tools/build/tasks/uber.clj
@@ -71,13 +71,13 @@
   {:write {path {:string (str (System/lineSeparator) (stream->string in)), :append true}}})
 
 (defn- conflict-append-dedupe
-  [{:keys [path in ^File existing state] :as _params}]
+  [{:keys [lib path in ^File existing state] :as _params}]
   (let [existing-content (slurp existing)
         existing-lower (str/lower-case existing-content)
         new-content (stream->string in)
         new-content-lower (str/lower-case new-content)
         seen (or (get-in state [:append-dedupe path]) #{existing-lower})]
-    (println "\nconflict-append-dedupe" path)
+    (println "\nconflict-append-dedupe" path lib)
     (println "state:" state)
     (println "seen:" seen)
     (println "existing:" existing-lower)

diff --git a/src/test/clojure/clojure/tools/build/tasks/test_uber.clj b/src/test/clojure/clojure/tools/build/tasks/test_uber.clj
@@ -137,6 +137,7 @@
           (slurp (project-path "target/unzip/META-INF/LICENSE.txt"))))))
 
 (deftest test-conflicts-but-files
+  (println "\n>>>test-conflicts-but-files")
   (with-test-dir "test-data/uber-conflict"
     (api/set-project-root! (.getAbsolutePath *test-dir*))
 
@@ -201,6 +202,9 @@
     ;(println "j3: " (slurp (project-path "j3/META-INF/LICENSE.txt")))
     ;(println "unzip: " (slurp (project-path "target/unzip/META-INF/LICENSE.txt")))
 
+    (println "<<<test-conflicts-but-files")
+    (println)
+
     ;; LICENSE files append but no dupes - include j1 and j2, but not j3 (dupe of j1)
     (is (= (str (slurp (project-path "j1/META-INF/LICENSE.txt")) (System/lineSeparator)
                 (slurp (project-path "j2/META-INF/LICENSE.txt")))