From 5b2b120486583bcd15508f6c2b5249188f19041f Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Thu, 5 Nov 1998 07:00:14 +0000 Subject: [PATCH] ... original commit: f8235233c74d2eb374d61127c4a1b0cbaac8e18f --- collects/tests/framework/exit.ss | 8 +++++++- collects/tests/framework/main.ss | 9 ++++++--- notes/mred/MrEd_100_Framework.txt | 6 ++++++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/collects/tests/framework/exit.ss b/collects/tests/framework/exit.ss index 53c8f1c5..f31ebdae 100644 --- a/collects/tests/framework/exit.ss +++ b/collects/tests/framework/exit.ss @@ -1 +1,7 @@ -(send-sexp-to-mred '(exit:exit)) \ No newline at end of file +(send-sexp-to-mred '(exit:exit)) +(let loop () + (sleep 3) + (when (mred-running?) + (printf "still running~n") + (loop))) +(printf "not running~n") \ No newline at end of file diff --git a/collects/tests/framework/main.ss b/collects/tests/framework/main.ss index e3e4f969..4812f41e 100644 --- a/collects/tests/framework/main.ss +++ b/collects/tests/framework/main.ss @@ -27,14 +27,15 @@ (lambda (port) (write 6012 port)))) -(define-values (shutdown-listener shutdown-mred send-sexp-to-mred) +(define-values (shutdown-listener shutdown-mred mred-running? send-sexp-to-mred) (let ([listener (let loop () (let ([port (load-relative "receive-sexps-port.ss")]) (with-handlers ([(lambda (x) #t) (lambda (x) (let ([next (+ port 1)]) - (call-with-output-file "receive-sexps-port.ss" + (call-with-output-file (build-path (current-load-relative-directory) + "receive-sexps-port.ss") (lambda (p) (write next p)) 'truncate) @@ -67,6 +68,8 @@ (close-input-port in-port) (set! in-port #f) (set! in-port #f))) + (lambda () + (not (eof-object? (peek-char in-port)))) (lambda (sexp) (unless (and in-port out-port) (restart-mred)) @@ -90,7 +93,7 @@ (= 2 (length answer))) (error 'framework-test-suite "unpected result from mred: ~s~n" answer)) (case (car answer) - [(error) (error 'mred (second answer))] + [(error) (error 'mred (format "~a; input: ~s" (second answer) sexp))] [(cant-read) (error 'mred/cant-parse (second answer))] [(normal) (second answer)]))))))) diff --git a/notes/mred/MrEd_100_Framework.txt b/notes/mred/MrEd_100_Framework.txt index 26b834cf..5125a162 100644 --- a/notes/mred/MrEd_100_Framework.txt +++ b/notes/mred/MrEd_100_Framework.txt @@ -9,6 +9,12 @@ into a separate application. Subtle Changes: + - get-edit -> get-editor + - get-panel -> get-??-container + - other mred-sympathetic names changes + + - menus + - the built in keymap functions no longer call: add-editor-keymap-functions add-text-keymap-functions and