From 2178fbf4d48b549d099b519f34e9953363de0129 Mon Sep 17 00:00:00 2001
From: Ryan Culpepper <ryanc@racket-lang.org>
Date: Fri, 18 Jul 2014 16:35:58 -0400
Subject: [PATCH] fixed macro stepper test (cherry picked from commit
 f4978d2fdbcb9365f6e3c13455547cf825bf9f15)

---
 .../macro-debugger/model/trace.rkt                   | 12 +++---------
 .../tests/macro-debugger/tests/regression.rkt        |  9 +++++----
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/trace.rkt b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/trace.rkt
index 1d1a515c2c..f58c5b9b17 100644
--- a/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/trace.rkt
+++ b/pkgs/macro-debugger-pkgs/macro-debugger-text-lib/macro-debugger/model/trace.rkt
@@ -1,5 +1,6 @@
 #lang racket/base
-(require racket/promise
+(require (for-syntax racket/base)
+         racket/promise
          racket/list
          syntax/modcode
          syntax/modresolve
@@ -199,13 +200,6 @@
     [(begin-for-syntax . _)
      (eval/compile stx)]
     [(define-values (id ...) . _)
-     (with-syntax ([defvals (stx-car stx)]
-                   [undefined (letrec ([x x]) x)])
-       (for ([id (syntax->list #'(id ...))])
-         (with-syntax ([id id])
-           (eval/compile #'(defvals (id) undefined)))))
-     ;; Following doesn't work (namespace mismatch)
-     ;; (eval/compile #'(define-values (id ...) (let ([id #f] ...) (values id ...))))
-     ]
+     (eval/compile #'(define-syntaxes (id ...) (values)))]
     [_else
      (void)]))
diff --git a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/regression.rkt b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/regression.rkt
index 78748de312..178308f511 100644
--- a/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/regression.rkt
+++ b/pkgs/macro-debugger-pkgs/macro-debugger/tests/macro-debugger/tests/regression.rkt
@@ -193,10 +193,11 @@
 
     (test-case "macro def within begin"
       (let ([rs (reductions
-                 (trace '(begin
-                           (define-syntax-rule (m x e)
-                             (define x e))
-                           (m y 12))))])
+                 (parameterize ((current-namespace testing-namespace))
+                   (trace '(begin
+                             (define-syntax-rule (m x e)
+                               (define x e))
+                             (m y 12)))))])
         (check-pred list? rs)
         (check-false (ormap misstep? rs))
         (check-true (for/or ([step rs])