Clear exceptions before enabling traps.

diff --git a/tests/runtime/test-arith.scm b/tests/runtime/test-arith.scm
index f8a5cb6c9b0cdbd66ea8470592dfe58f50b6c9ba..a018bdd7a4c77b51213bd9cb562df7e1b60f8d83 100644 (file)
--- a/tests/runtime/test-arith.scm
+++ b/tests/runtime/test-arith.scm
@@ -123,9 +123,11 @@ USA.
 (define (yes-traps f)
   (if (flo:have-trap-enable/disable?)
       ;; XXX Should enable all traps.
-      (flo:with-trapped-exceptions
-          (fix:or (flo:exception:invalid-operation) (flo:exception:overflow))
-        f)
+      (begin
+        (flo:clear-exceptions! (flo:supported-exceptions))
+        (flo:with-trapped-exceptions
+            (fix:or (flo:exception:invalid-operation) (flo:exception:overflow))
+          f))
       (f)))
 
 (define (define-enumerated-test prefix cases procedure)

diff --git a/tests/runtime/test-flonum.scm b/tests/runtime/test-flonum.scm
index e68e57ce1ab41b39908721352853afa761d2d71c..87fbf0e1cfb6b39fb9ded0ef2fe049296051db88 100644 (file)
--- a/tests/runtime/test-flonum.scm
+++ b/tests/runtime/test-flonum.scm
@@ -117,7 +117,11 @@ USA.
 (define (yes-traps f)
   (if (flo:have-trap-enable/disable?)
       ;; XXX Should enable all traps.
-      (flo:with-trapped-exceptions (flo:exception:invalid-operation) f)
+      (begin
+        (flo:clear-exceptions! (flo:supported-exceptions))
+        (flo:with-trapped-exceptions
+            (fix:or (flo:exception:invalid-operation) (flo:exception:overflow))
+          f))
       (f)))
 
 (define subnormal+ flo:smallest-positive-subnormal)