From 577bae67698a6cf65f8472329bb185fe0e5ced5a Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Sat, 10 Aug 2013 05:23:32 -0500
Subject: [PATCH] add some debugging to try to figure out why the drdr run of
 these files are going wrong

---
 .../gui-test/framework/tests/test-suite-utils.rkt        | 4 +++-
 .../racket-test/tests/racket/contract/all.rkt            | 9 ++++++++-
 .../racket-test/tests/racket/contract/contract-out.rkt   | 4 +++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/test-suite-utils.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/test-suite-utils.rkt
index 06295eebee..62ea3c4891 100644
--- a/pkgs/gui-pkgs/gui-test/framework/tests/test-suite-utils.rkt
+++ b/pkgs/gui-pkgs/gui-test/framework/tests/test-suite-utils.rkt
@@ -99,7 +99,9 @@
               racket-bin
               (path->string
                (collection-file-path "framework-test-engine.rkt" "framework" "tests")))
-       (eprintf "starting gracket failed; used path ~s\n" racket-bin))))
+       (eprintf "starting gracket failed; used path ~s; (find-system-path 'exec-file) = ~s\n"
+                racket-bin
+                (find-system-path 'exec-file)))))
   (debug-printf mz-tcp "accepting listener\n")
   (let-values ([(in out) (tcp-accept listener)])
     (set! in-port in)
diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/contract/all.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/contract/all.rkt
index ab27ba6410..57d70174a8 100644
--- a/pkgs/racket-pkgs/racket-test/tests/racket/contract/all.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/racket/contract/all.rkt
@@ -177,14 +177,21 @@
            (dynamic-require (build-path (this-dir) (car file)) #f)))))]))
   
 (define (replay-io file-to-run io)
+  (flush-output (current-output-port))
+  (flush-output (current-error-port))
   (printf "FINISHED ~a\n" (car file-to-run))
   (for ([pr (in-list io)])
     (display (cdr pr)
              ((case (car pr)
                 [(out) current-output-port]
-                [(err) current-error-port])))))    
+                [(err) current-error-port]))))
+  (flush-output (current-output-port))
+  (flush-output (current-error-port)))
 
 (main)
+
+(flush-output (current-output-port))
+(flush-output (current-error-port))
 (fprintf (if (zero? failures)
              (current-output-port)
              (current-error-port))
diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/contract/contract-out.rkt b/pkgs/racket-pkgs/racket-test/tests/racket/contract/contract-out.rkt
index 3e328d2738..48f0a4fdd0 100644
--- a/pkgs/racket-pkgs/racket-test/tests/racket/contract/contract-out.rkt
+++ b/pkgs/racket-pkgs/racket-test/tests/racket/contract/contract-out.rkt
@@ -660,7 +660,9 @@
                            (λ (x)
                              (define m 
                                (regexp-match #rx"contract-out[.]rkt[^ ]*.30" (exn-message x)))
-                             (and m (car m)))))
+                             (if m 
+                                 (car m) 
+                                 (list 'regexp-match-failed (exn-message x))))))
             (contract-eval '(require 'provide/contract-35/n)))))
   
   ;; test that provide/contract by itself in a module doesn't signal an error