diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt index 71e3bbe7..42113ab1 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/run.rkt @@ -16,10 +16,11 @@ (test-begin ;; ugly, but otherwise rackunit spews the entire logs to ;; stderr, and they can be quite long + (define-values (tr-log output) (generate-log name dir)) (check-equal? ;; actual log (with-input-from-string - (string-append "(" (generate-log name dir) ")") + (string-append "(" tr-log output ")") read) ;; expected log (with-input-from-file (build-path dir name) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt index 2c52ccfe..33a32a76 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt @@ -11,7 +11,7 @@ (define (transform file dir) ;; generate the new log, that will become the expected log - (define new-log (generate-log file dir)) + (define-values (new-tr-log new-output) (generate-log file dir)) (define in (open-input-file (build-path dir file))) (read-line in) ; drop the #; (read in) ; drop the old expected log @@ -20,7 +20,7 @@ (lambda () (displayln "#;") (displayln "#<namespace anchor)) - (namespace-attach-module orig-namespace 'racket) - (namespace-attach-module orig-namespace 'typed-racket/core) - (dynamic-require file #f))))))) + (define regular-output + (with-output-to-string + (lambda () + (with-tr-logging-to-port + tr-log-output + (thunk + (parameterize ([current-namespace (make-base-empty-namespace)] + [current-load/use-compiled test-load/use-compiled]) + (define orig-namespace (namespace-anchor->namespace anchor)) + (namespace-attach-module orig-namespace 'racket) + (namespace-attach-module orig-namespace 'typed-racket/core) + (dynamic-require file #f))))))) + (list (get-output-string tr-log-output) regular-output)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/send-places.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/send-places.rkt index e36a3a21..4470c8be 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/send-places.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/send-places.rkt @@ -23,12 +23,13 @@ (define (generate-log name dir) - (cond [(places) - (define-values (res-ch res-ch*) (place-channel)) - (place-channel-put enq-ch (vector 'log name dir res-ch*)) - (define res (place-channel-get res-ch)) - (if (s-exn? res) - (raise (deserialize-exn res)) - res)] - [else - (generate-log/place name dir)])) + (apply values + (cond [(places) + (define-values (res-ch res-ch*) (place-channel)) + (place-channel-put enq-ch (vector 'log name dir res-ch*)) + (define res (place-channel-get res-ch)) + (if (s-exn? res) + (raise (deserialize-exn res)) + res)] + [else + (generate-log/place name dir)])))