move jdk24 jvm-opts to separate

Signed-off-by: Sean Corfield <sean@corfield.org>
This commit is contained in:
Sean Corfield 2025-03-25 20:48:46 -07:00
parent a40abc285e
commit 14b4c3435f
No known key found for this signature in database
2 changed files with 11 additions and 7 deletions

View file

@ -50,7 +50,7 @@
org.apache.logging.log4j/log4j-jul {:mvn/version "2.24.3"} org.apache.logging.log4j/log4j-jul {:mvn/version "2.24.3"}
org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.24.3"} org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.24.3"}
org.apache.logging.log4j/log4j-slf4j2-impl {:mvn/version "2.24.3"}} org.apache.logging.log4j/log4j-slf4j2-impl {:mvn/version "2.24.3"}}
:jvm-opts ["-Dlog4j2.configurationFile=log4j2-info.properties" :jvm-opts ["-Dlog4j2.configurationFile=log4j2-info.properties"]}
;; for SQLite on JDK 24: :runner {:main-opts ["-m" "lazytest.main"]}
"--enable-native-access=ALL-UNNAMED"]} :jdk24 {:jvm-opts [;; for SQLite on JDK 24 locally
:runner {:main-opts ["-m" "lazytest.main"]}}} "--enable-native-access=ALL-UNNAMED"]}}}

View file

@ -5,9 +5,13 @@
(defn- run-tests [env v] (defn- run-tests [env v]
(when v (println "\nTesting Clojure" v)) (when v (println "\nTesting Clojure" v))
(let [{:keys [exit]} (let [{:keys [exit]}
(p/shell {:extra-env env} "clojure" (str "-M" (p/shell {:extra-env env}
(when v (str ":" v)) "clojure"
":test:runner") (str "-M"
(when v (str ":" v))
":test:runner"
;; to suppress native access warnings on JDK24:
":jdk24")
"--output" "dots")] "--output" "dots")]
(when-not (zero? exit) (when-not (zero? exit)
(System/exit exit)))) (System/exit exit))))