Changeset 15006

Timestamp:

05/15/17 20:37:44 (6 years ago)

Author:

Mark Evenson

Message:

jss: fix test

(Olof-Joachim Frahm)

Merges <​https://github.com/armedbear/abcl/pull/42>.

File:

• trunk/abcl/contrib/jss/jss-tests.lisp (modified) (2 diffs)

trunk/abcl/contrib/jss/jss-tests.lisp

@@ -42 +42 @@
 
 
-(is-type (let ((just-loop (cl-user::print-db (timeit (just-loop 10000)))))
+(is-type (let ((just-loop (timeit (just-loop 10000))))
      (+ 0.0 
         (print (/ (-  (timeit (optimized-jss 10000)) just-loop)
@@ -48 +48 @@
    '(float 0 0.1))
 
-(is (let* ((jss::*inhibit-jss-optimization* nil)
-     (optimized-jss (macroexpand (precompiler::precompile-form '(#"compile" 'regex.Pattern ".*") t))))
-      (let* ((jss::*inhibit-jss-optimization* t)
-       (unoptimized-jss (macroexpand (precompiler::precompile-form '(#"compile" 'regex.Pattern ".*") t))))
-  (and (eq (car optimized-jss) 'jstatic)
-       (eq (caar unoptimized-jss) 'lambda)))))
+(let* ((jss::*inhibit-jss-optimization* nil)
+       (optimized-jss (macroexpand (precompiler::precompile-form '(#"compile" 'regex.Pattern ".*") t))))
+  (let* ((jss::*inhibit-jss-optimization* t)
+         (unoptimized-jss (macroexpand (precompiler::precompile-form '(#"compile" 'regex.Pattern ".*") t))))
+    (is (car optimized-jss) 'java:jstatic)
+    (is (caar unoptimized-jss) 'lambda)))
 
 (finalize)