918e2798db
analyze-form now mirrors resolve-sym's full resolution order: jolt var (current ns / clojure.core), then the runtime/Janet env, then a pending forward-ref cell. Previously a name that resolves only via the Janet-env fallback (int?, type, …) interned an empty var and miscompiled; now it emits the runtime binding directly, matching the interpreter. suite-worker honors JOLT_COMPILE=1 to run the whole clojure-test-suite through the compile path. Under compilation it now passes 3932 / errors 124 — at parity with the interpreter baseline (3913 / 125) across 4600+ assertions, confirming the hybrid compile path doesn't diverge from the interpreter.
51 lines
2.7 KiB
Text
51 lines
2.7 KiB
Text
# One-file worker for the clojure-test-suite battery. Loads the clojure.test
|
|
# shim, evaluates a single suite .cljc file, runs its deftests, and prints
|
|
# "pass fail error" to stdout. Used by the discovery pass to find files that
|
|
# hang under Jolt's eager evaluation (run under an external timeout).
|
|
(use ../../src/jolt/api)
|
|
(use ../../src/jolt/reader)
|
|
(use ../../src/jolt/evaluator)
|
|
|
|
(defn- parse-forms [src]
|
|
(var s src) (def fs @[]) (var go true)
|
|
(while (and go (> (length (string/trim s)) 0))
|
|
(def r (protect (parse-next s)))
|
|
(if (not (r 0)) (set go false)
|
|
(let [p (r 1)] (set s (p 1)) (when (not (nil? (p 0))) (array/push fs (p 0))))))
|
|
fs)
|
|
|
|
# A helper, not a standalone test: it needs a .cljc path argument. When `jpm
|
|
# test` runs it with no args, no-op cleanly so it doesn't count as a failure.
|
|
(def path (get (dyn :args) 1))
|
|
|
|
(when path
|
|
# JOLT_COMPILE=1 runs the suite through the compile path (hybrid: hot forms
|
|
# compile, unsupported forms fall back to the interpreter) so the whole battery
|
|
# validates compile-mode correctness against the same baseline.
|
|
(def compile? (= "1" (os/getenv "JOLT_COMPILE")))
|
|
(def ctx (init (if compile? {:compile? true} {})))
|
|
(defn run-form [f] (if compile? (eval-one ctx f) (eval-form ctx @{} f)))
|
|
(each f (parse-forms (slurp "test/support/clojure_test.clj")) (run-form f))
|
|
|
|
# Pre-load the suite's own clojure.core-test.number-range helper ns if present
|
|
# (35 files require it for r/max-int, r/max-double, … — its :default branches are
|
|
# plain numeric literals Jolt can read). Its `ns` form sets the namespace; the
|
|
# test file's own `ns` form switches back afterwards.
|
|
(let [dir (string/slice path 0 (- (length path) (length (last (string/split "/" path)))))
|
|
nr (string dir "number_range.cljc")]
|
|
(when (os/stat nr)
|
|
(each f (parse-forms (slurp nr)) (protect (run-form f)))))
|
|
|
|
(eval-string ctx "(clojure.test/reset-report!)")
|
|
(each form (parse-forms (slurp path)) (protect (run-form form)))
|
|
(protect (eval-string ctx "(clojure.test/run-registered)"))
|
|
(def p (eval-string ctx "(clojure.test/n-pass)"))
|
|
(def f (eval-string ctx "(clojure.test/n-fail)"))
|
|
(def e (eval-string ctx "(clojure.test/n-error)"))
|
|
# A "dump" 2nd arg (or SUITE_DUMP env) also prints each failure/error message
|
|
# (one DUMP line each) for triage.
|
|
(when (or (os/getenv "SUITE_DUMP") (= "dump" (get (dyn :args) 2)))
|
|
(eval-string ctx "(doseq [m (clojure.test/failures)] (println (str \"DUMP \" m)))"))
|
|
# Counts on a sentinel line so parsers find it even if a test body printed to
|
|
# stdout (e.g. with-out-str / println-str tests).
|
|
(printf "@@COUNTS %d %d %d" (if (number? p) p 0) (if (number? f) f 0) (if (number? e) e 0)))
|