TCHECK-137: Self-host tests not runnable

clojure · Dec 7, 2017 · 51c39a5 · 51c39a5
1 parent 1a0000d
commit 51c39a5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/script/test-self-host.clj b/script/test-self-host.clj
@@ -14,4 +14,5 @@
 
 (copy-source "cljs/test.cljc")
 (copy-source "cljs/analyzer/api.cljc")
+(copy-source "cljs/reader.clj")
 (copy-source "clojure/template.clj")
diff --git a/src/main/clojure/clojure/test/check/clojure_test/assertions/cljs.clj b/src/main/clojure/clojure/test/check/clojure_test/assertions/cljs.clj
diff --git a/src/main/clojure/clojure/test/check/clojure_test/assertions/cljs.cljc b/src/main/clojure/clojure/test/check/clojure_test/assertions/cljs.cljc
@@ -0,0 +1,16 @@
+(ns clojure.test.check.clojure-test.assertions.cljs)
+
+#?(:clj
+   (try
+     (require 'cljs.test
+       '[clojure.test.check.clojure-test.assertions :as assertions])
+
+     (eval
+       '(defmethod cljs.test/assert-expr 'clojure.test.check.clojure-test/check?
+          [_ msg form]
+          (assertions/check? msg form)))
+     (catch java.io.FileNotFoundException e))
+   :cljs
+   (defmethod cljs.test$macros/assert-expr 'clojure.test.check.clojure-test/check?
+     [_ msg form]
+     (clojure.test.check.clojure-test.assertions/check? msg form)))
diff --git a/src/target/cljs/self-host/clojure/test/check/test/aux.cljs b/src/target/cljs/self-host/clojure/test/check/test/aux.cljs
@@ -81,7 +81,6 @@
     goog.iter.Iterator
     goog.json
     goog.json.EvalJsonProcessor
-    goog.json.HybridJsonProcessor
     goog.json.NativeJsonProcessor
     goog.json.Replacer
     goog.json.Reviver