From 2287399f246955badf9d61bf123145e76eaf884d Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Fri, 2 Mar 2007 17:03:09 +0000 Subject: [PATCH] 1.0.3.13: working NaN comparison tests outside Darwin * Other platforms have invalid operation traps normally in effect. --- tests/float.pure.lisp | 35 ++++++++++++++++++----------------- version.lisp-expr | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/tests/float.pure.lisp b/tests/float.pure.lisp index a907faf97..568513109 100644 --- a/tests/float.pure.lisp +++ b/tests/float.pure.lisp @@ -158,20 +158,21 @@ (+ x0 x1 x6 x7) (+ x2 x3 x4 x5))))))) (with-test (:name :nan-comparisons) - (macrolet ((test (form) - (let ((nform (subst (/ 0.0 0.0) 'nan form))) - `(progn - (assert (not (eval ',nform))) - (assert (not (funcall (lambda () ,nform)))))))) - ;; Source transforms for >= and <= used to be too eager about - ;; inverting the test, causing NaN issues. - (test (>= nan 1.0)) - (test (>= 1.0 nan)) - (test (>= 1.0 nan 0.0)) - (test (>= 1.0 0.0 nan)) - (test (>= nan 1.0 0.0)) - (test (<= nan 1.0)) - (test (<= 1.0 nan)) - (test (<= 1.0 nan 2.0)) - (test (<= 1.0 2.0 nan)) - (test (<= nan 1.0 2.0)))) + (sb-int:with-float-traps-masked (:invalid) + (macrolet ((test (form) + (let ((nform (subst '(/ 0.0 0.0) 'nan form))) + `(progn + (assert (not (eval ',nform))) + (assert (not (funcall (lambda () ,nform)))))))) + ;; Source transforms for >= and <= used to be too eager about + ;; inverting the test, causing NaN issues. + (test (>= nan 1.0)) + (test (>= 1.0 nan)) + (test (>= 1.0 nan 0.0)) + (test (>= 1.0 0.0 nan)) + (test (>= nan 1.0 0.0)) + (test (<= nan 1.0)) + (test (<= 1.0 nan)) + (test (<= 1.0 nan 2.0)) + (test (<= 1.0 2.0 nan)) + (test (<= nan 1.0 2.0))))) diff --git a/version.lisp-expr b/version.lisp-expr index 5081f96ff..968322c5a 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"1.0.3.12" +"1.0.3.13" -- 2.11.4.GIT