From a70c022355dd2058392b91f9946b71a89f090692 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Mon, 9 Aug 1999 03:33:25 +0000
Subject: [PATCH] ...

original commit: d8c9b4fefec67ccd98893041fb4fe332f864820b
---
 collects/tests/framework/load.ss | 46 ++------------------------------
 collects/tests/framework/main.ss |  1 +
 2 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/collects/tests/framework/load.ss b/collects/tests/framework/load.ss
index 3ad44dc9..06aab13f 100644
--- a/collects/tests/framework/load.ss
+++ b/collects/tests/framework/load.ss
@@ -21,13 +21,12 @@
    pred
    '(parameterize ([current-namespace (make-namespace 'mred)])
       (require-library "tests.ss" "framework")
-      (require-library "mred-interfaces.ss" "framework")
       (eval
        '(define-values/invoke-unit/sig
          ((unit test : framework:test^))
 	 (compound-unit/sig
 	   (import)
-	   (link [mred : mred-interfaces^ (mred-interfaces@)]
+	   (link [mred : mred^ (mred@)]
 		 [keys : framework:keys^ ((require-library "keys.ss" "framework"))]
 		 [test : framework:test^ ((require-library "testr.ss" "framework") mred keys)])
 	   (export (unit test)))))
@@ -42,47 +41,17 @@
       (global-defined-value 'test:run-one)
       (global-defined-value 'test:button-push)
       (void)))
-  (test
-   'mred-interfacess.ss
-   pred
-   '(parameterize ([current-namespace (make-namespace 'mred)])
-      (require-library "mred-interfacess.ss" "framework")
-      (global-defined-value 'mred-interfaces^)
-      (void)))
-  (test
-   'mred-interfaces.ss
-   pred
-   '(parameterize ([current-namespace (make-namespace 'mred)])
-      (require-library "mred-interfaces.ss" "framework")
-      (global-defined-value 'mred-interfaces^)
-      (global-defined-value 'mred-interfaces@)
-      (void)))
-  (test
-   'mred-interfaces.ss/gen
-   (lambda (x) x)
-   '(parameterize ([current-namespace (make-namespace 'mred)])
-      (require-library "invoke.ss")
-      (require-library "mred-interfaces.ss" "framework")
-      (eval
-       '(let ([orig-button% button%])
-	  (define-values/invoke-unit/sig mred-interfaces^ mred-interfaces@)
-	  (let ([first-button% button%])
-	    (define-values/invoke-unit/sig mred-interfaces^ mred-interfaces@)
-	    (let ([second-button% button%])
-	      (and (eq? second-button% first-button%)
-		   (not (eq? first-button% orig-button%)))))))))
   (test
    'frameworkr.ss
    pred
    '(parameterize ([current-namespace (make-namespace 'mred)])
       (require-library "frameworks.ss" "framework")
-      (require-library "mred-interfaces.ss" "framework")
       (eval
        '(define-values/invoke-unit/sig
          framework^
 	 (compound-unit/sig
 	   (import)
-	   (link [mred : mred-interfaces^ (mred-interfaces@)]
+	   (link [mred : mred^ (mred@)]
 		 [core : mzlib:core^ ((require-library "corer.ss"))]
 		 [framework : framework^ ((require-library "frameworkr.ss" "framework") core mred)])
 	   (export (open framework)))))
@@ -113,17 +82,6 @@
 	((global-defined-value 'pretty-print-print-line) np)
 	(require-library "framework.ss" "framework")
 	(eq? np ((global-defined-value 'pretty-print-print-line))))))
-  (test
-   'framework.ss/test.ss
-   (lambda (x) x)
-   '(parameterize ([current-namespace (make-namespace 'mred)])
-      (let ([orig-button% (global-defined-value 'button%)])
-	(require-library "test.ss" "framework")
-	(let* ([test-button% (global-defined-value 'button%)])
-	  (require-library "framework.ss" "framework")
-	  (let* ([fw-button% (global-defined-value 'button%)])
-	    (and (eq? fw-button% test-button%)
-		 (not (eq? fw-button% orig-button%))))))))
 
   (load-framework-automatically old-load-framework-automatically?))
 
diff --git a/collects/tests/framework/main.ss b/collects/tests/framework/main.ss
index dc311d29..54a7b169 100644
--- a/collects/tests/framework/main.ss
+++ b/collects/tests/framework/main.ss
@@ -2,6 +2,7 @@
 (require-library "cores.ss")
 (require-library "cmdlines.ss")
 (require-library "macro.ss")
+(require-library "function.ss")
 
 (unless (file-exists? (build-path (current-load-relative-directory) "receive-sexps-port.ss"))
   (call-with-output-file (build-path (current-load-relative-directory) "receive-sexps-port.ss")