From b5cce5fcab01bd1f1842761d6dcfdf018ff5f5e8 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Wed, 16 Jan 2019 20:41:04 -0700
Subject: [PATCH] cs: adjust some tests to pass

---
 pkgs/racket-test-core/tests/racket/for.rktl  |  4 ++--
 pkgs/racket-test-core/tests/racket/math.rktl | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/racket-test-core/tests/racket/for.rktl b/pkgs/racket-test-core/tests/racket/for.rktl
index a0219efbee..a83947ab2b 100644
--- a/pkgs/racket-test-core/tests/racket/for.rktl
+++ b/pkgs/racket-test-core/tests/racket/for.rktl
@@ -615,7 +615,7 @@
              #rx".*expected number of values not received.*")
 (err/rt-test (begin (for/fold ([x 1]) () (values 1 2)) 1)
              exn:fail:contract:arity?
-             #rx".*expected number of values not received.*")
+             #rx"expected number of values not received|returned two values to single value return context")
 (err/rt-test (begin (for/fold ([x 1] [y 2]) ([i (in-range 10)]) 1) 1)
              exn:fail:contract:arity?
              #rx".*expected number of values not received.*")
@@ -692,7 +692,7 @@
              #rx"expected: hash\\?")
 (err/rt-test (for ([x (in-hash (hash 1 2))]) x)
              exn:fail:contract:arity?
-             #rx"expected number of values not received")
+             #rx"expected number of values not received|returned two values to single value return context")
 
 (err/rt-test (for ([x (in-hash 1 2 3)]) x)
              exn:fail:contract:arity?)
diff --git a/pkgs/racket-test-core/tests/racket/math.rktl b/pkgs/racket-test-core/tests/racket/math.rktl
index f326793384..6c2dfe7447 100644
--- a/pkgs/racket-test-core/tests/racket/math.rktl
+++ b/pkgs/racket-test-core/tests/racket/math.rktl
@@ -56,10 +56,14 @@
          ((abs (- x y)) . < . #e1e-10))))
 
 (define (single=? x y)
-  (and (single-flonum? y)
-       (let ([x  (inexact->exact x)]
-             [y  (inexact->exact y)])
-         ((abs (- x y)) . < . #e1e-6))))
+  (cond
+    [(eq? 'chez-scheme (system-type 'vm))
+     (double=? x y)]
+    [else
+     (and (single-flonum? y)
+          (let ([x  (inexact->exact x)]
+                [y  (inexact->exact y)])
+            ((abs (- x y)) . < . #e1e-6)))]))
 
 ;; =========================================================================
 ;; pi