From 3efca9178e379d88d255f27efe7543fce7d8a036 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Mon, 17 May 2010 01:30:38 -0400 Subject: [PATCH] Rename "collects/tests/mred" -> ".../gracket". Some additional mred-related tweaks. original commit: fcedc30ee4787d955adab3e0e656332812685e25 --- collects/tests/framework/README | 8 ++--- .../tests/framework/framework-test-engine | 2 +- collects/tests/framework/group-test.rkt | 4 +-- collects/tests/framework/test-suite-utils.rkt | 16 +++++----- collects/tests/{mred => gracket}/.gitignore | 0 collects/tests/{mred => gracket}/README | 29 +++++++++--------- collects/tests/{mred => gracket}/auto.rktl | 0 collects/tests/{mred => gracket}/blits.rkt | 0 .../tests/{mred => gracket}/button-steps.txt | 0 .../tests/{mred => gracket}/cache-image8.mre | 0 .../tests/{mred => gracket}/canvas-steps.txt | 0 .../{mred => gracket}/checkbox-steps.txt | 0 .../{mred => gracket}/choice-list-steps.txt | 0 collects/tests/{mred => gracket}/dc.rktl | 0 .../tests/{mred => gracket}/draw-info.txt | 0 collects/tests/{mred => gracket}/draw.rkt | 0 collects/tests/{mred => gracket}/editor.rktl | 0 .../tests/{mred => gracket}/frame-steps.txt | 0 .../tests/{mred => gracket}/gauge-steps.txt | 0 collects/tests/{mred => gracket}/item.rkt | 0 .../tests/{mred => gracket}/loadtest.rktl | 0 collects/tests/{mred => gracket}/media3.mre | Bin collects/tests/{mred => gracket}/media6.mre | Bin collects/tests/{mred => gracket}/media8.mre | 0 .../{mred => gracket}/mediastream.example | Bin collects/tests/{mred => gracket}/mem.rktl | 2 +- .../tests/{mred => gracket}/menu-steps.txt | 0 collects/tests/{mred => gracket}/nruter.xbm | 0 collects/tests/{mred => gracket}/paramz.rktl | 0 collects/tests/{mred => gracket}/png.rktl | 0 collects/tests/{mred => gracket}/prog6.mre | Bin collects/tests/{mred => gracket}/prog8.mre | 0 .../{mred => gracket}/radiobox-steps.txt | 0 .../tests/{mred => gracket}/slider-steps.txt | 0 .../{mred => gracket}/test-editor-admin.rkt | 0 collects/tests/{mred => gracket}/testbox6.mre | Bin collects/tests/{mred => gracket}/testbox8.mre | 0 collects/tests/{mred => gracket}/testing.rktl | 0 .../tests/{mred => gracket}/windowing.rktl | 0 .../tests/{mred => gracket}/wxme-random.rkt | 0 collects/tests/{mred => gracket}/wxme.rkt | 0 41 files changed, 31 insertions(+), 30 deletions(-) rename collects/tests/{mred => gracket}/.gitignore (100%) rename collects/tests/{mred => gracket}/README (76%) rename collects/tests/{mred => gracket}/auto.rktl (100%) rename collects/tests/{mred => gracket}/blits.rkt (100%) rename collects/tests/{mred => gracket}/button-steps.txt (100%) rename collects/tests/{mred => gracket}/cache-image8.mre (100%) rename collects/tests/{mred => gracket}/canvas-steps.txt (100%) rename collects/tests/{mred => gracket}/checkbox-steps.txt (100%) rename collects/tests/{mred => gracket}/choice-list-steps.txt (100%) rename collects/tests/{mred => gracket}/dc.rktl (100%) rename collects/tests/{mred => gracket}/draw-info.txt (100%) rename collects/tests/{mred => gracket}/draw.rkt (100%) rename collects/tests/{mred => gracket}/editor.rktl (100%) rename collects/tests/{mred => gracket}/frame-steps.txt (100%) rename collects/tests/{mred => gracket}/gauge-steps.txt (100%) rename collects/tests/{mred => gracket}/item.rkt (100%) rename collects/tests/{mred => gracket}/loadtest.rktl (100%) rename collects/tests/{mred => gracket}/media3.mre (100%) rename collects/tests/{mred => gracket}/media6.mre (100%) rename collects/tests/{mred => gracket}/media8.mre (100%) rename collects/tests/{mred => gracket}/mediastream.example (100%) rename collects/tests/{mred => gracket}/mem.rktl (99%) rename collects/tests/{mred => gracket}/menu-steps.txt (100%) rename collects/tests/{mred => gracket}/nruter.xbm (100%) rename collects/tests/{mred => gracket}/paramz.rktl (100%) rename collects/tests/{mred => gracket}/png.rktl (100%) rename collects/tests/{mred => gracket}/prog6.mre (100%) rename collects/tests/{mred => gracket}/prog8.mre (100%) rename collects/tests/{mred => gracket}/radiobox-steps.txt (100%) rename collects/tests/{mred => gracket}/slider-steps.txt (100%) rename collects/tests/{mred => gracket}/test-editor-admin.rkt (100%) rename collects/tests/{mred => gracket}/testbox6.mre (100%) rename collects/tests/{mred => gracket}/testbox8.mre (100%) rename collects/tests/{mred => gracket}/testing.rktl (100%) rename collects/tests/{mred => gracket}/windowing.rktl (100%) rename collects/tests/{mred => gracket}/wxme-random.rkt (100%) rename collects/tests/{mred => gracket}/wxme.rkt (100%) diff --git a/collects/tests/framework/README b/collects/tests/framework/README index e2b5276c..60f808df 100644 --- a/collects/tests/framework/README +++ b/collects/tests/framework/README @@ -7,9 +7,9 @@ completion of the engine test suites and the mzscheme test suites. All of these tests reside in PLTHOME/collects/tests/framework/ -There will be a main mzscheme process which will start up a new mred +There will be a main mzscheme process which will start up a new gracket as necessary for the test suites. Since some tests actually require -mred to exit in order to pass, this governor is required. +gracket to exit in order to pass, this governor is required. To run a test use: @@ -22,7 +22,7 @@ Some of the tests in this file are not yet present in the testing directory. They are planned future expansions of this test suite (and have been for some time....) -OS X: you will have to click on the newly started mred +OS X: you will have to click on the newly started gracket processes in the doc while the test suite runs or it will signal failures when there aren't any. @@ -39,7 +39,7 @@ signal failures when there aren't any. - preferences: |# prefs.ss #| | This tests that preferences are saved and restored correctly, both - | immediately and across reboots of mred. + | immediately and across reboots of gracket. - individual object tests: diff --git a/collects/tests/framework/framework-test-engine b/collects/tests/framework/framework-test-engine index 0fd8bdcb..911b88cf 100755 --- a/collects/tests/framework/framework-test-engine +++ b/collects/tests/framework/framework-test-engine @@ -1,3 +1,3 @@ #!/bin/sh -exec mred -qu framework-test-engine.ss "$@" +exec gracket -u framework-test-engine.rkt "$@" diff --git a/collects/tests/framework/group-test.rkt b/collects/tests/framework/group-test.rkt index b5285bfb..65a8d393 100644 --- a/collects/tests/framework/group-test.rkt +++ b/collects/tests/framework/group-test.rkt @@ -14,7 +14,7 @@ (car x) (error 'car* "got a non-pair for ~s" 'x))]))) -;; this test uses a new eventspace so that the mred function +;; this test uses a new eventspace so that the gracket function ;; current-eventspace-has-standard-menus? returns #f and thus ;; all of the platforms behave the same way. (test @@ -182,4 +182,4 @@ (unless (equal? (send x get-label) "first") (send x close))) frames)))))) - ) \ No newline at end of file + ) diff --git a/collects/tests/framework/test-suite-utils.rkt b/collects/tests/framework/test-suite-utils.rkt index 2f060aa1..657cc0ce 100644 --- a/collects/tests/framework/test-suite-utils.rkt +++ b/collects/tests/framework/test-suite-utils.rkt @@ -88,7 +88,7 @@ (let-values ([(dir exe _) (split-path (find-system-path 'exec-file))]) dir) - (if (eq? 'windows (system-type)) "GRacket.exe" "mred"))) + (if (eq? 'windows (system-type)) "GRacket.exe" "gracket"))) (path->string (build-path (collection-path "tests" "framework") "framework-test-engine.ss"))))) @@ -172,15 +172,15 @@ (or (not (char-ready? in-port)) (not (eof-object? (peek-char in-port)))))) (restart-mred)) - (debug-printf messages " ~a // ~a: sending to mred:\n" + (debug-printf messages " ~a // ~a: sending to gracket:\n" section-name test-name) (show-text sexp) (with-handlers ([exn:fail? (lambda (x) (cond - ;; this means that mred was closed + ;; this means that gracket was closed ;; so we can restart it and try again. - [(tcp-error? x) + [(tcp-error? x) (restart-mred) (write sexp out-port) (newline out-port) @@ -210,21 +210,21 @@ (cons char (loop)))) null))))))))]) (read in-port))]) - (debug-printf messages " ~a // ~a: received from mred:\n" section-name test-name) + (debug-printf messages " ~a // ~a: received from gracket:\n" section-name test-name) (show-text answer) (unless (or (eof-object? answer) (and (list? answer) (= 2 (length answer)) (memq (car answer) '(error last-error cant-read normal)))) - (error 'send-sexp-to-mred "unpected result from mred: ~s\n" answer)) + (error 'send-sexp-to-mred "unpected result from gracket: ~s\n" answer)) (if (eof-object? answer) (raise (make-eof-result)) (case (car answer) [(error) - (error 'send-sexp-to-mred "mred raised \"~a\"" (second answer))] + (error 'send-sexp-to-mred "gracket raised \"~a\"" (second answer))] [(last-error) - (error 'send-sexp-to-mred "mred (last time) raised \"~a\"" (second answer))] + (error 'send-sexp-to-mred "gracket (last time) raised \"~a\"" (second answer))] [(cant-read) (error 'mred/cant-parse (second answer))] [(normal) (eval (second answer))])))))) diff --git a/collects/tests/mred/.gitignore b/collects/tests/gracket/.gitignore similarity index 100% rename from collects/tests/mred/.gitignore rename to collects/tests/gracket/.gitignore diff --git a/collects/tests/mred/README b/collects/tests/gracket/README similarity index 76% rename from collects/tests/mred/README rename to collects/tests/gracket/README index aa94a21a..3f0f5878 100644 --- a/collects/tests/mred/README +++ b/collects/tests/gracket/README @@ -1,17 +1,17 @@ -The "item.ss" test (use load/cd) creates a frame to select among +The "item.rkt" test (use `require') creates a frame to select among several types of control-testing frames. Click the `Get Instructions' button in the top-left for more information. --------------------------------------------------------------------------- -The "draw.ss" test (use load/cd) tests drawing commands. Click the +The "draw.rkt" test (use load/cd) tests drawing commands. Click the "What Should I See?" button for further details. --------------------------------------------------------------------------- -The "mem.ss" test is loaded at startup: - mred -r mem.ss +The "mem.rktl" test is loaded at startup: + gracket -r mem.rktl Creates a lot of frames and instance of other objects, reporting memory information along the way. At the end, before the last memory dump, objects that are still allocated are displayed like this: @@ -24,8 +24,8 @@ A large number of lines (say, 50) indicates a GC problem. --------------------------------------------------------------------------- [Out of date:] -The "random.ss" test is a randomized test of the GRacket classes that tests -GRacket's stability. Load "random.ss", and then run +The "random.rktl" test is a randomized test of the GRacket classes that tests +GRacket's stability. Load "random.rktl", and then run (init) This attempts to create instances of classes using random intialization arguments. (init) can be run any number of times. @@ -37,7 +37,7 @@ arguments. To avoid testing much of the wxMedia toolbox, which is likely to be platform-independent, (define skip-media? #t) before loading -"random.ss". +"random.rktl". ================================================== @@ -46,8 +46,8 @@ Old Stuff --------------------------------------------------------------------------- -The "imred.ss" test is used to check for memory leaks in a loop -invoking the mred system. Call the `go' procedure with a list +The "imred.rktl" test is used to check for memory leaks in a loop +invoking the gracket system. Call the `go' procedure with a list of symbol flags: 'force not included: Use the current eventspaces; expects mred:run-exit-callbacks @@ -66,22 +66,23 @@ of symbol flags: --------------------------------------------------------------------------- -"startup" tests the startup flags of mred. run "run.ss" from that directory. +"startup" tests the startup flags of gracket. +run "run.rktl" from that directory. --------------------------------------------------------------------------- -"frame-edit.ss" checks that various frames match with various +"frame-edit.rktl" checks that various frames match with various edits. Under construction. --------------------------------------------------------------------------- -"gui.ss" tests: +"gui.rktl" tests: - save prompting (before closing unsaved files) and - autosaving -evaluate `(load "gui.ss")' in the console to run. +evaluate `(load "gui.rktl")' in the console to run. -It also overwrites the file "tmp.ss" in the testing directory. +It also overwrites the file "tmp.rktd" in the testing directory. --------------------------------------------------------------------------- diff --git a/collects/tests/mred/auto.rktl b/collects/tests/gracket/auto.rktl similarity index 100% rename from collects/tests/mred/auto.rktl rename to collects/tests/gracket/auto.rktl diff --git a/collects/tests/mred/blits.rkt b/collects/tests/gracket/blits.rkt similarity index 100% rename from collects/tests/mred/blits.rkt rename to collects/tests/gracket/blits.rkt diff --git a/collects/tests/mred/button-steps.txt b/collects/tests/gracket/button-steps.txt similarity index 100% rename from collects/tests/mred/button-steps.txt rename to collects/tests/gracket/button-steps.txt diff --git a/collects/tests/mred/cache-image8.mre b/collects/tests/gracket/cache-image8.mre similarity index 100% rename from collects/tests/mred/cache-image8.mre rename to collects/tests/gracket/cache-image8.mre diff --git a/collects/tests/mred/canvas-steps.txt b/collects/tests/gracket/canvas-steps.txt similarity index 100% rename from collects/tests/mred/canvas-steps.txt rename to collects/tests/gracket/canvas-steps.txt diff --git a/collects/tests/mred/checkbox-steps.txt b/collects/tests/gracket/checkbox-steps.txt similarity index 100% rename from collects/tests/mred/checkbox-steps.txt rename to collects/tests/gracket/checkbox-steps.txt diff --git a/collects/tests/mred/choice-list-steps.txt b/collects/tests/gracket/choice-list-steps.txt similarity index 100% rename from collects/tests/mred/choice-list-steps.txt rename to collects/tests/gracket/choice-list-steps.txt diff --git a/collects/tests/mred/dc.rktl b/collects/tests/gracket/dc.rktl similarity index 100% rename from collects/tests/mred/dc.rktl rename to collects/tests/gracket/dc.rktl diff --git a/collects/tests/mred/draw-info.txt b/collects/tests/gracket/draw-info.txt similarity index 100% rename from collects/tests/mred/draw-info.txt rename to collects/tests/gracket/draw-info.txt diff --git a/collects/tests/mred/draw.rkt b/collects/tests/gracket/draw.rkt similarity index 100% rename from collects/tests/mred/draw.rkt rename to collects/tests/gracket/draw.rkt diff --git a/collects/tests/mred/editor.rktl b/collects/tests/gracket/editor.rktl similarity index 100% rename from collects/tests/mred/editor.rktl rename to collects/tests/gracket/editor.rktl diff --git a/collects/tests/mred/frame-steps.txt b/collects/tests/gracket/frame-steps.txt similarity index 100% rename from collects/tests/mred/frame-steps.txt rename to collects/tests/gracket/frame-steps.txt diff --git a/collects/tests/mred/gauge-steps.txt b/collects/tests/gracket/gauge-steps.txt similarity index 100% rename from collects/tests/mred/gauge-steps.txt rename to collects/tests/gracket/gauge-steps.txt diff --git a/collects/tests/mred/item.rkt b/collects/tests/gracket/item.rkt similarity index 100% rename from collects/tests/mred/item.rkt rename to collects/tests/gracket/item.rkt diff --git a/collects/tests/mred/loadtest.rktl b/collects/tests/gracket/loadtest.rktl similarity index 100% rename from collects/tests/mred/loadtest.rktl rename to collects/tests/gracket/loadtest.rktl diff --git a/collects/tests/mred/media3.mre b/collects/tests/gracket/media3.mre similarity index 100% rename from collects/tests/mred/media3.mre rename to collects/tests/gracket/media3.mre diff --git a/collects/tests/mred/media6.mre b/collects/tests/gracket/media6.mre similarity index 100% rename from collects/tests/mred/media6.mre rename to collects/tests/gracket/media6.mre diff --git a/collects/tests/mred/media8.mre b/collects/tests/gracket/media8.mre similarity index 100% rename from collects/tests/mred/media8.mre rename to collects/tests/gracket/media8.mre diff --git a/collects/tests/mred/mediastream.example b/collects/tests/gracket/mediastream.example similarity index 100% rename from collects/tests/mred/mediastream.example rename to collects/tests/gracket/mediastream.example diff --git a/collects/tests/mred/mem.rktl b/collects/tests/gracket/mem.rktl similarity index 99% rename from collects/tests/mred/mem.rktl rename to collects/tests/gracket/mem.rktl index 8719899a..78ea4c90 100644 --- a/collects/tests/mred/mem.rktl +++ b/collects/tests/gracket/mem.rktl @@ -1,5 +1,5 @@ -; run with mred -u -- -f mem.ss +; run with gracket -u -- -f mem.rktl (require mzlib/class100) diff --git a/collects/tests/mred/menu-steps.txt b/collects/tests/gracket/menu-steps.txt similarity index 100% rename from collects/tests/mred/menu-steps.txt rename to collects/tests/gracket/menu-steps.txt diff --git a/collects/tests/mred/nruter.xbm b/collects/tests/gracket/nruter.xbm similarity index 100% rename from collects/tests/mred/nruter.xbm rename to collects/tests/gracket/nruter.xbm diff --git a/collects/tests/mred/paramz.rktl b/collects/tests/gracket/paramz.rktl similarity index 100% rename from collects/tests/mred/paramz.rktl rename to collects/tests/gracket/paramz.rktl diff --git a/collects/tests/mred/png.rktl b/collects/tests/gracket/png.rktl similarity index 100% rename from collects/tests/mred/png.rktl rename to collects/tests/gracket/png.rktl diff --git a/collects/tests/mred/prog6.mre b/collects/tests/gracket/prog6.mre similarity index 100% rename from collects/tests/mred/prog6.mre rename to collects/tests/gracket/prog6.mre diff --git a/collects/tests/mred/prog8.mre b/collects/tests/gracket/prog8.mre similarity index 100% rename from collects/tests/mred/prog8.mre rename to collects/tests/gracket/prog8.mre diff --git a/collects/tests/mred/radiobox-steps.txt b/collects/tests/gracket/radiobox-steps.txt similarity index 100% rename from collects/tests/mred/radiobox-steps.txt rename to collects/tests/gracket/radiobox-steps.txt diff --git a/collects/tests/mred/slider-steps.txt b/collects/tests/gracket/slider-steps.txt similarity index 100% rename from collects/tests/mred/slider-steps.txt rename to collects/tests/gracket/slider-steps.txt diff --git a/collects/tests/mred/test-editor-admin.rkt b/collects/tests/gracket/test-editor-admin.rkt similarity index 100% rename from collects/tests/mred/test-editor-admin.rkt rename to collects/tests/gracket/test-editor-admin.rkt diff --git a/collects/tests/mred/testbox6.mre b/collects/tests/gracket/testbox6.mre similarity index 100% rename from collects/tests/mred/testbox6.mre rename to collects/tests/gracket/testbox6.mre diff --git a/collects/tests/mred/testbox8.mre b/collects/tests/gracket/testbox8.mre similarity index 100% rename from collects/tests/mred/testbox8.mre rename to collects/tests/gracket/testbox8.mre diff --git a/collects/tests/mred/testing.rktl b/collects/tests/gracket/testing.rktl similarity index 100% rename from collects/tests/mred/testing.rktl rename to collects/tests/gracket/testing.rktl diff --git a/collects/tests/mred/windowing.rktl b/collects/tests/gracket/windowing.rktl similarity index 100% rename from collects/tests/mred/windowing.rktl rename to collects/tests/gracket/windowing.rktl diff --git a/collects/tests/mred/wxme-random.rkt b/collects/tests/gracket/wxme-random.rkt similarity index 100% rename from collects/tests/mred/wxme-random.rkt rename to collects/tests/gracket/wxme-random.rkt diff --git a/collects/tests/mred/wxme.rkt b/collects/tests/gracket/wxme.rkt similarity index 100% rename from collects/tests/mred/wxme.rkt rename to collects/tests/gracket/wxme.rkt