detect failures in cljs test infrastructure

This makes a test fail, if require'ing the cljs testsuite fails on a
combination of clojure/jdk >= 1.8/1.8

also revert a5553b5 because jenkins now
has a recent jdk

Author: bendlas

src/test/clojure/clojure/data/xml/test_cljs.clj

@@ -16,7 +16,15 @@
     (require 'clojure.data.xml.cljs-testsuite)
     (eval '(clojure.data.xml.cljs-testsuite/run-testsuite! "target/cljs-test-nashorn"))
     (catch Exception e
-      (println "WARN: clojurescript test suite not available with Clojure"
-               *clojure-version* (System/getProperty "java.runtime.name")
-               (System/getProperty "java.vm.version") (System/getProperty "java.runtime.version")
-               \newline e))))
+      (if (or (neg? (compare ((juxt :major :minor) *clojure-version*)
+                             [1 8]))
+              (neg? (compare (System/getProperty "java.runtime.version")
+                             "1.8")))
+        (println "WARN: ignoring cljs testsuite error on clojure < 1.8 or jdk < 1.8"
+                 *clojure-version* (System/getProperty "java.runtime.name")
+                 (System/getProperty "java.vm.version") (System/getProperty "java.runtime.version")
+                 \newline (str e))
+        (do (println "ERROR: cljs nashorn test suite should be able to run on clojure >= 1.8 and jdk >= 1.8"
+                     *clojure-version* (System/getProperty "java.runtime.name")
+                     (System/getProperty "java.vm.version") (System/getProperty "java.runtime.version"))
+            (throw e))))))

src/test/resources/clojure/data/xml/cljs_testsuite.clj

@@ -34,9 +34,7 @@
 
 (defn run-testsuite! [dir]
   (System/setProperty "nashorn.persistent.code.cache" "target/nashorn_code_cache")
-  (let [engine (repl-nh/create-engine
-                ;; wait for upgrade to more recent jdk8
-                :code-cache false)]
+  (let [engine (repl-nh/create-engine)]
     (println "INFO" "Running nashorn-repl with" (System/getProperty "nashorn.persistent.code.cache"))
     (compile-testsuite! dir)
     (.eval engine (io/reader (io/file dir "tests.reopt.js")))