From a67c0c7250242751f518e666aa59a6d5f201a226 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Sun, 20 Apr 2014 20:04:30 -0600
Subject: [PATCH] fix mzlib tests for use-before-initialization

original commit: 1727e4dbfcc223d0230cd05e598b0863f69395a8
---
 .../tests/mzlib/contract-mzlib-test.rktl      |  4 +--
 .../tests/mzlib/macrolib.rktl                 | 36 +++++++++----------
 .../tests/mzlib/unitsig.rktl                  |  3 +-
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/contract-mzlib-test.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/contract-mzlib-test.rktl
index 0fcd51b..82ec26b 100644
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/contract-mzlib-test.rktl
+++ b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/contract-mzlib-test.rktl
@@ -4178,8 +4178,8 @@ so that propagation occurs.
   (test-name 'printable/c printable/c)
   (test-name '(or/c 'a 'b 'c) (symbols 'a 'b 'c))
   (test-name '(or/c 1 2 3) (one-of/c 1 2 3))
-  (test-name '(or/c '() 'x 1 #f #\a void? undefined?)
-             (one-of/c '() 'x 1 #f #\a (void) (letrec ([x x]) x)))
+  (test-name '(or/c '() 'x 1 #f #\a void?)
+             (one-of/c '() 'x 1 #f #\a (void)))
   
   (test-name '(subclass?/c c%) 
              (let ([c% (class object% (super-new))]) (subclass?/c c%)))
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/macrolib.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/macrolib.rktl
index 2f1ab25..1e5b522 100644
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/macrolib.rktl
+++ b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/macrolib.rktl
@@ -5,24 +5,24 @@
 
 (require mzlib/etc)
 
-(let ([u (letrec ([x x]) x)])
-  (let ([l1
-	 (let+ ([rec a a]
-		[recs [b c] [c b]]
-		[rec d 1]
-		[val e 1]
-		[val x 1]
-		[val y 2]
-		[vals (x y) (y x)]
-		[rec (values f) (values 1)]
-		[vals [(values g h) (values 2 3)]]
-		[val i 3]
-		[_ (set! i 4)
-		   (set! i 5)])
-	       'x
-	       (list a b c d e x y f g h i))]
-	[l2 (list u u u 1 1 2 1 1 2 3 5)])
-    (test l1 'let-plus l2)))
+(err/rt-test (let+ ([rec a a]) 5) exn:fail:contract:variable?)
+(err/rt-test (let+ ([recs [b c] [c b]]) 5) exn:fail:contract:variable?)
+
+(let ([l1
+       (let+ ([rec d 1]
+              [val e 1]
+              [val x 1]
+              [val y 2]
+              [vals (x y) (y x)]
+              [rec (values f) (values 1)]
+              [vals [(values g h) (values 2 3)]]
+              [val i 3]
+              [_ (set! i 4)
+                 (set! i 5)])
+             'x
+             (list d e x y f g h i))]
+      [l2 (list 1 1 2 1 1 2 3 5)])
+  (test l1 'let-plus l2))
 
 (test 'hi 'local (local () 'hi))
 (define x 7)
diff --git a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unitsig.rktl b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unitsig.rktl
index 9b38ca1..b0ea4b3 100644
--- a/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unitsig.rktl
+++ b/pkgs/compatibility-pkgs/compatibility-test/tests/mzlib/unitsig.rktl
@@ -9,6 +9,7 @@
 (require mzlib/unit200)
 (require mzlib/unitsig200)
 (require mzlib/include)
+(require racket/undefined)
 
 (Section 'unit/sig)
 
@@ -127,7 +128,7 @@
 ; Self-import is now allowed
 ; (syntax-test #'(compound-unit/sig (import) (link (A : () (0 A))) (export))) ; self-import
 ; (syntax-test #'(compound-unit/sig (import) (link (A : (x) (0 A))) (export))) ; self-import
-(test (list (letrec ([x x]) x) 5)
+(test (list undefined 5)
       'self-import
       (invoke-unit/sig
        (compound-unit/sig