From c9c233ec324a83846e630921c8e93c974b2ac0ce Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sun, 2 Oct 2022 12:02:56 +0200 Subject: [PATCH] fix test --- src/babashka/impl/clojure/spec/test/alpha.clj | 2 +- src/babashka/main.clj | 42 +++++++++++-------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/babashka/impl/clojure/spec/test/alpha.clj b/src/babashka/impl/clojure/spec/test/alpha.clj index bf917915..98a635bc 100644 --- a/src/babashka/impl/clojure/spec/test/alpha.clj +++ b/src/babashka/impl/clojure/spec/test/alpha.clj @@ -150,7 +150,7 @@ (.applyTo ^clojure.lang.IFn f args))))) ;; orchestra is going to override this -(def spec-checking-fn-var (sci/copy-var spec-checking-fn* tns)) +(def spec-checking-fn-var (sci/new-var 'spec-checking-fn spec-checking-fn* {:ns tns})) (defn- no-fspec [v spec] diff --git a/src/babashka/main.clj b/src/babashka/main.clj index cdface52..2c51b689 100644 --- a/src/babashka/main.clj +++ b/src/babashka/main.clj @@ -887,7 +887,7 @@ Use bb run --help to show this help output. _ (vreset! common/ctx sci-ctx) _ (when-let [pods (:pods @common/bb-edn)] (when-let [pod-metadata (pods/load-pods-metadata - pods {:download-only (download-only?)})] + pods {:download-only (download-only?)})] (vreset! pod-namespaces pod-metadata))) preloads (some-> (System/getenv "BABASHKA_PRELOADS") (str/trim)) [expressions exit-code] @@ -1128,23 +1128,31 @@ Use bb run --help to show this help output. ;;;; Scratch -(defn where-am-i [depth] - (let [ks [:fileName :lineNumber :className]] - (clojure.pprint/print-table - ks - (map (comp #(select-keys % ks) bean) - (take depth (.getStackTrace (Thread/currentThread))))))) +(defmacro in-native-image-or-aot + [& body] + `(when (or (System/getProperty "org.graalvm.nativeimage.kind") + (System/getProperty "com.oracle.graalvm.isaot")) + ~@body)) -(alter-var-root #'require - (fn [_old-req] - (fn [& args] - (prn :require-args args) - (System/exit 1)))) +(in-native-image-or-aot -(alter-var-root #'requiring-resolve - (fn [_old-req] - (fn [& args] - (prn :requiring-resolve-args args) - (System/exit 1)))) + #_(defn where-am-i [depth] + (let [ks [:fileName :lineNumber :className]] + (clojure.pprint/print-table + ks + (map (comp #(select-keys % ks) bean) + (take depth (.getStackTrace (Thread/currentThread))))))) + + (alter-var-root #'require + (fn [_old-req] + (fn [& args] + (prn :require-args args) + (System/exit 1)))) + + (alter-var-root #'requiring-resolve + (fn [_old-req] + (fn [& args] + (prn :requiring-resolve-args args) + (System/exit 1))))) (comment)