Fix native image exe path generation

Not naming names, but someone was not testing on Windows
with a clean target. Ok. It was me.

This also fixes reporting of Windows generated exe file size.

Addendum to #165

Author: lread

script/test_native.clj

@@ -2,6 +2,7 @@
 
 (ns test-native
   (:require [clojure.java.io :as io]
+            [helper.env :as env]
             [helper.fs :as fs]
             [helper.graal :as graal]
             [helper.main :as main]
@@ -21,7 +22,7 @@
     (let [native-image-xmx "6g"
           target-path "target"
           target-exe "rewrite-clj-test"
-          full-target-exe (str (io/file target-path target-exe))]
+          full-target-exe (str target-path "/" target-exe (when (= :win (env/get-os)) ".exe"))]
       (status/line :head "Creating native image for test")
       (status/line :detail "java -version")
       (shell/command "java -version")

script/test_native_sci.clj

@@ -18,22 +18,19 @@
   (shell/command "clojure -M:sci-test:gen-reflection" fname)
   (status/line :detail fname))
 
-(defn interpret-tests []
+(defn interpret-tests [exe-fname]
   (status/line :head "Interpreting tests with sci using natively compiled binary")
-  (let [exe-fname (if (= :win (env/get-os))
-                    "target/sci-test-rewrite-clj.exe"
-                    "target/sci-test-rewrite-clj")]
-    (when (not (.exists (io/file exe-fname)))
-      (status/die 1 "native image %s not found." exe-fname))
-    (shell/command exe-fname "--file" "script/sci_test_runner.clj" "--classpath" "test")))
+  (when (not (.exists (io/file exe-fname)))
+    (status/die 1 "native image %s not found." exe-fname))
+  (shell/command exe-fname "--file" "script/sci_test_runner.clj" "--classpath" "test"))
 
 (defn -main [& args]
   (when (main/doc-arg-opt args)
     (let [native-image-xmx "6g"
           graal-reflection-fname "target/native-image/reflection.json"
           target-path "target"
           target-exe "sci-test-rewrite-clj"
-          full-target-exe (str (io/file target-path target-exe))]
+          full-target-exe (str target-path "/" target-exe (when (= :win (env/get-os)) ".exe"))]
       (status/line :head "Creating native image for testing via sci")
       (status/line :detail "java -version")
       (shell/command "java -version")
@@ -53,7 +50,7 @@
                                    :entry-class "sci_test.main"})))
       (status/line :head "build done")
       (status/line :detail "built: %s, %d bytes" full-target-exe (.length (io/file full-target-exe)))
-      (interpret-tests)))
+      (interpret-tests full-target-exe)))
   nil)
 
 (main/when-invoked-as-script