native image tests: Add Clojure 1.11 alpha

Author: lread

.github/workflows/native-image-test.yml

@@ -10,8 +10,9 @@ jobs:
         os: [ windows-latest, ubuntu-latest, macos-latest ]
         graal-java: [ java11 ]
         test: [ test-native, test-native-sci ]
+        clojure-version: [ 1.10, 1.11 ]
 
-    name: ${{ matrix.os }},${{ matrix.graal-java }},${{ matrix.test }}
+    name: ${{ matrix.os }},${{ matrix.graal-java }},${{ matrix.test }},clj ${{matrix.clojure-version}}
 
     steps:
     - uses: actions/checkout@v2
@@ -113,5 +114,5 @@ jobs:
       shell: cmd
       if: matrix.os == 'windows-latest'
     - name: Execute ${{ matrix.test }} native test (macos, linux)
-      run: bb ${{ matrix.test }}
+      run: bb ${{ matrix.test }} --clojure-version ${{ matrix.clojure-version }}
       if: matrix.os != 'windows-latest'

script/test_jvm_sci.clj

@@ -5,13 +5,31 @@
             [helper.shell :as shell]
             [lread.status-line :as status]))
 
+(def allowed-clojure-versions '("1.10" "1.11"))
+
+(def args-usage "Valid args: [options]
+
+Options:
+  -v, --clojure-version VERSION  Test with Clojure [1.10, 1.11] [default: 1.10]
+  --help                         Show this help")
+
+
+(defn validate-opts [opts]
+  (when (not (some #{(get opts "--clojure-version")} allowed-clojure-versions))
+        (status/die 1 args-usage)))
+
+
 (defn -main [& args]
-  (when (main/doc-arg-opt args)
-    (status/line :head "Exposing rewrite-clj API to sci")
-    (shell/command "clojure -M:script -m sci-test-gen-publics")
+  (when-let [opts (main/doc-arg-opt args-usage args)]
+    (validate-opts opts)
+    (let [clojure-version (get opts "--clojure-version")]
+
+      (status/line :head "Exposing rewrite-clj API to sci")
+      (shell/command "clojure -M:script -m sci-test-gen-publics")
 
-    (status/line :head "Interpreting tests with sci from using JVM")
-    (shell/command "clojure -M:sci-test -m sci-test.main --file script/sci_test_runner.clj --classpath test"))
+      (status/line :head "Interpreting tests with sci from using JVM using Clojure %s" clojure-version)
+      (shell/command (format "clojure -M:sci-test:%s -m sci-test.main --file script/sci_test_runner.clj --classpath test"
+                             clojure-version))))
   nil)
 
 (main/when-invoked-as-script

script/test_native.clj

@@ -17,9 +17,24 @@
                  "-m" "clj-graal.gen-test-runner"
                  "--dest-dir" dir "test-by-namespace"))
 
+(def allowed-clojure-versions '("1.10" "1.11"))
+
+(def args-usage "Valid args: [options]
+
+Options:
+  -v, --clojure-version VERSION  Test with Clojure [1.10, 1.11] [default: 1.10]
+  --help                         Show this help")
+
+
+(defn validate-opts [opts]
+  (when (not (some #{(get opts "--clojure-version")} allowed-clojure-versions))
+        (status/die 1 args-usage)))
+
 (defn -main [& args]
-  (when (main/doc-arg-opt args)
-    (let [native-image-xmx "6g"
+  (when-let [opts (main/doc-arg-opt args-usage args)]
+    (validate-opts opts)
+    (let [clojure-version (get opts "--clojure-version")
+          native-image-xmx "6g"
           target-path "target"
           target-exe "rewrite-clj-test"
           full-target-exe (str target-path "/" target-exe (when (= :win (env/get-os)) ".exe"))]
@@ -31,7 +46,7 @@
             test-runner-dir "target/generated/graal"]
         (graal/clean)
         (generate-test-runner test-runner-dir)
-        (let [classpath (graal/compute-classpath "test-common:graal:native-test")]
+        (let [classpath (graal/compute-classpath (str "test-common:graal:native-test:" clojure-version))]
           (graal/aot-compile-sources classpath "clj-graal.test-runner")
           (graal/run-native-image {:graal-native-image graal-native-image
                                    :target-path target-path

script/test_native_sci.clj

@@ -24,9 +24,24 @@
     (status/die 1 "native image %s not found." exe-fname))
   (shell/command exe-fname "--file" "script/sci_test_runner.clj" "--classpath" "test"))
 
+(def allowed-clojure-versions '("1.10" "1.11"))
+
+(def args-usage "Valid args: [options]
+
+Options:
+  -v, --clojure-version VERSION  Test with Clojure [1.10, 1.11] [default: 1.10]
+  --help                         Show this help")
+
+
+(defn validate-opts [opts]
+  (when (not (some #{(get opts "--clojure-version")} allowed-clojure-versions))
+        (status/die 1 args-usage)))
+
 (defn -main [& args]
-  (when (main/doc-arg-opt args)
-    (let [native-image-xmx "6g"
+  (when-let [opts (main/doc-arg-opt args-usage args)]
+    (validate-opts opts)
+    (let [clojure-version (get opts "--clojure-version")
+          native-image-xmx "6g"
           graal-reflection-fname "target/native-image/reflection.json"
           target-path "target"
           target-exe "sci-test-rewrite-clj"
@@ -38,7 +53,7 @@
       (let [graal-native-image (graal/find-graal-native-image)]
         (graal/clean)
         (expose-api-to-sci)
-        (let [classpath (graal/compute-classpath "graal:sci-test")]
+        (let [classpath (graal/compute-classpath (str "graal:sci-test:" clojure-version))]
           (graal/aot-compile-sources classpath "sci-test.main")
           (generate-reflection-file graal-reflection-fname)
           (graal/run-native-image {:graal-native-image graal-native-image