[Sbcl-commits] master: Workaround for lp# 1370836

[Douglas K. <sn...@us...>]

The branch "master" has been updated in SBCL:
       via  b260000599032a41e41e2c70ecccb6bbd8822e80 (commit)
      from  5c6f48aefa52a0796f0e3cb136882cc19d3f1158 (commit)

- Log -----------------------------------------------------------------
commit b260000599032a41e41e2c70ecccb6bbd8822e80
Author: Douglas Katzman <do...@go...>
Date:   Wed Sep 17 23:53:03 2014 -0400

    Workaround for lp# 1370836
    
    Part of this change is sane and part is a total hack.
    The reasonable aspect is that by separating 4 tests, we don't
    see all of the :FUNCTION-LAMBDA-EXPRESSION test failing - only
    the functions that failed the disassembly test.
    The kludgy part is that this isn't even a deterministic fix
    for the disassembler bug - it's just a randomization of the
    memory addresses that happens to make it not crash now.
---
 tests/interface.impure.lisp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/interface.impure.lisp b/tests/interface.impure.lisp
index 9d97dbc..e59213f 100644
--- a/tests/interface.impure.lisp
+++ b/tests/interface.impure.lisp
@@ -20,13 +20,14 @@
 (with-test (:name :disassemble)
 ;;; DISASSEMBLE shouldn't fail on closures or unpurified functions
   (defun disassemble-fun (x) x)
-  (disassemble 'disassemble-fun)
+  (disassemble 'disassemble-fun))
 
+(with-test (:name :disassemble-closure)
   (let ((x 1)) (defun disassemble-closure (y) (if y (setq x y) x)))
-  (disassemble 'disassemble-closure)
+  (disassemble 'disassemble-closure))
 
-  #+sb-eval
-  (progn
+#+sb-eval
+(with-test (:name :disassemble-interpreted)
     ;; Nor should it fail on interpreted functions
     (let ((sb-ext:*evaluator-mode* :interpret))
       (eval `(defun disassemble-eval (x) x))
@@ -38,6 +39,7 @@
     ;; is not installed.)"
     (assert (sb-eval:interpreted-function-p #'disassemble-eval)))
 
+(with-test (:name :disassemble-generic)
   ;; nor should it fail on generic functions or other funcallable instances
   (defgeneric disassemble-generic (x))
   (disassemble 'disassemble-generic)

-----------------------------------------------------------------------


hooks/post-receive
-- 
SBCL