From eae6aaa90f9d16ce4fb9e2c90d41c0c53049bf26 Mon Sep 17 00:00:00 2001
From: Eric Dobson <eric.n.dobson@gmail.com>
Date: Fri, 21 Jun 2013 09:34:57 -0700
Subject: [PATCH] Don't add other files TR logs to optimization tests.

original commit: f6a0494f65bcc0793cde102a0a55fa4ad6a83fbe
---
 .../missed-optimizations/multi-file2.rkt      |  6 ++----
 .../tests/typed-racket/places.rkt             | 21 +++++++++++++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt
index 8355a964..2ac1f494 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/missed-optimizations/multi-file2.rkt
@@ -1,9 +1,7 @@
 #;#;
 #<<END
-TR info: multi-file1.rkt 13:2 (* x (ann 3 Integer)) -- exact real arith
-TR missed opt: multi-file1.rkt 13:2 (* x (ann 3 Integer)) -- all args float-arg-expr, result not Float -- caused by: 13:12 3
-TR opt: multi-file2.rkt 16:10 (+ 3 5) -- fixnum bounded expr
-TR opt: multi-file2.rkt 16:3 (* 3.4 (+ 3 5)) -- binary float
+TR opt: multi-file2.rkt 14:10 (+ 3 5) -- fixnum bounded expr
+TR opt: multi-file2.rkt 14:3 (* 3.4 (+ 3 5)) -- binary float
 END
 #<<END
 81.6
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt
index 97b5ba05..939578ac 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/places.rkt
@@ -70,6 +70,9 @@
   (define file (simplify-path (build-path dir name)))
   (define orig-load/use-compiled (current-load/use-compiled))
   (define orig-use-compiled-file-paths (use-compiled-file-paths))
+  (define full-tr-logs (make-queue))
+  (define sub-tr-logs (make-queue))
+
   (define (test-load/use-compiled path name)
     (parameterize [(use-compiled-file-paths null)
                    (current-load/use-compiled reset-load/use-compiled)]
@@ -77,14 +80,16 @@
   (define (reset-load/use-compiled path name)
     (parameterize [(use-compiled-file-paths orig-use-compiled-file-paths)
                    (current-load/use-compiled orig-load/use-compiled)]
-      (orig-load/use-compiled path name)))
-  (define tr-logs (make-queue))
+        (with-tr-logging-to-queue
+          sub-tr-logs
+          (thunk
+            (orig-load/use-compiled path name)))))
 
   (define regular-output
     (with-output-to-string
       (lambda ()
         (with-tr-logging-to-queue
-          tr-logs
+          full-tr-logs
           (thunk
             (parameterize ([current-namespace (make-base-empty-namespace)]
                            [current-load/use-compiled test-load/use-compiled])
@@ -92,4 +97,12 @@
               (namespace-attach-module orig-namespace 'racket)
               (namespace-attach-module orig-namespace 'typed-racket/core)
               (dynamic-require file #f)))))))
-  (list (sort (queue->list tr-logs) string<?) regular-output))
+
+  (define tr-logs
+    (let ((tr-logs (queue->list full-tr-logs)))
+      (sort
+        (for/fold ((tr-logs tr-logs)) ((entry (in-queue sub-tr-logs)))
+          (remove entry tr-logs))
+        string<?)))
+
+  (list tr-logs regular-output))