From 165f21a192f28746519c21cfd3b079ac73ff1b84 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Tue, 3 Jun 2014 07:38:57 +0100 Subject: [PATCH] tests: remove "gui" lock declarations The fresh PLTUSERHOME created by `raco test --drdr` should avoid the problems that made the lock necessary before. --- .../drracket-test/tests/drracket/example-tool.rkt | 1 - pkgs/drracket-pkgs/drracket-test/tests/drracket/hangman.rkt | 4 ---- pkgs/drracket-pkgs/drracket-test/tests/drracket/io.rkt | 1 - .../drracket-test/tests/drracket/language-test.rkt | 1 - .../drracket-pkgs/drracket-test/tests/drracket/memory-log.rkt | 4 ---- .../drracket-test/tests/drracket/module-lang-test.rkt | 1 - .../drracket-test/tests/drracket/repl-test-debug.rkt | 1 - .../drracket-test/tests/drracket/repl-test-debugprofile.rkt | 1 - .../drracket-test/tests/drracket/repl-test-misc.rkt | 2 +- .../drracket-test/tests/drracket/repl-test-raw.rkt | 1 - pkgs/drracket-pkgs/drracket-test/tests/drracket/snips.rkt | 4 ---- .../drracket-test/tests/drracket/syncheck-test.rkt | 1 - .../drracket-test/tests/drracket/teaching-lang-coverage.rkt | 4 ---- .../drracket-test/tests/drracket/teaching-lang-save-file.rkt | 4 ---- pkgs/drracket-pkgs/drracket-test/tests/drracket/teachpack.rkt | 4 ---- .../drracket-test/tests/drracket/test-engine-test.rkt | 1 - .../paint-by-numbers/raw-problems/build-solution-sets.rkt | 4 ---- .../mrlib/private/aligned-pasteboard/tests/actual-bigger.rkt | 4 ---- .../mrlib/private/aligned-pasteboard/tests/test-snip-lib.rkt | 4 ---- .../gui-lib/mrlib/private/aligned-pasteboard/tests/test.rkt | 4 ---- .../gui-lib/mrlib/private/aligned-pasteboard/tests/test2.rkt | 4 ---- pkgs/gui-pkgs/gui-test/framework/tests/main.rkt | 1 - pkgs/htdp-pkgs/htdp-test/2htdp/tests/full-scene-visible.rkt | 4 ---- .../htdp-test/2htdp/tests/on-tick-universe-with-limit.rkt | 4 ---- pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-robby.rkt | 4 ---- pkgs/htdp-pkgs/htdp-test/2htdp/tests/random-seed-works.rkt | 4 +++- pkgs/htdp-pkgs/htdp-test/2htdp/tests/record-stop-when.rkt | 4 ---- pkgs/htdp-pkgs/htdp-test/2htdp/tests/record.rkt | 4 ---- pkgs/htdp-pkgs/htdp-test/2htdp/tests/release.rkt | 4 ---- pkgs/htdp-pkgs/htdp-test/2htdp/tests/struct-universe.rkt | 1 - pkgs/htdp-pkgs/htdp-test/2htdp/tests/ufo-rename.rkt | 4 ---- pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-restart.rkt | 4 ---- pkgs/htdp-pkgs/htdp-test/2htdp/tests/world0-stops.rkt | 4 ---- 33 files changed, 4 insertions(+), 93 deletions(-) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/example-tool.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/example-tool.rkt index f7a546400b..a2ba535067 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/example-tool.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/example-tool.rkt @@ -34,5 +34,4 @@ (module+ test (module config info - (define lock-name "gui") (define random? #t))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/hangman.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/hangman.rkt index feccb90b7f..15e40a6d3a 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/hangman.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/hangman.rkt @@ -21,7 +21,3 @@ (define labels (map (λ (x) (send x get-label)) windows)) (member "Hangman" labels)) (poll-until user-hangman-frame?))) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/io.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/io.rkt index 4935a78098..4cb0cfbaee 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/io.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/io.rkt @@ -234,5 +234,4 @@ add this test: (module+ test (module config info - (define lock-name "gui") (define timeout 500))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/language-test.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/language-test.rkt index 27102ea983..a3a67c442c 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/language-test.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/language-test.rkt @@ -1580,5 +1580,4 @@ the settings above should match r5rs (module+ test (module config info - (define lock-name "gui") (define timeout 1500))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/memory-log.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/memory-log.rkt index a67b9f1f1b..fcd6763f58 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/memory-log.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/memory-log.rkt @@ -72,7 +72,3 @@ (λ () (send (send drs-frame get-definitions-text) syncheck:arrows-visible?))) (wait-and-print)))) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-lang-test.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-lang-test.rkt index 3560283953..5d887318df 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-lang-test.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/module-lang-test.rkt @@ -428,5 +428,4 @@ (eval-jit-enabled #f) (dynamic-require (quote-module-path "..") #f) (module config info - (define lock-name "gui") (define timeout 800))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debug.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debug.rkt index 57ee315368..7e8e44e331 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debug.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debug.rkt @@ -4,5 +4,4 @@ (module+ test (module config info - (define lock-name "gui") (define timeout 300))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debugprofile.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debugprofile.rkt index 2550a8c785..73a290071a 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debugprofile.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-debugprofile.rkt @@ -4,5 +4,4 @@ (module+ test (module config info - (define lock-name "gui") (define timeout 300))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-misc.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-misc.rkt index 10f05bfae4..5e6d0f11ae 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-misc.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-misc.rkt @@ -4,4 +4,4 @@ (module+ test (module config info - (define lock-name "gui"))) + (define timeout 300))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-raw.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-raw.rkt index 227482ba8b..df58fa5cce 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-raw.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/repl-test-raw.rkt @@ -4,5 +4,4 @@ (module+ test (module config info - (define lock-name "gui") (define timeout 300))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snips.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snips.rkt index e3d4c275c8..fae1d1ce56 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/snips.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/snips.rkt @@ -24,7 +24,3 @@ (error 'snips.rkt "lost drracket frame while saving ~s" rfile)))) (delete-directory/files tmpdir))) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/syncheck-test.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/syncheck-test.rkt index ff144b16b3..2ffc11fa72 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/syncheck-test.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/syncheck-test.rkt @@ -1682,5 +1682,4 @@ (module+ test (module config info - (define lock-name "gui") (define timeout 200))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-coverage.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-coverage.rkt index 9fff3145f9..19df1430c0 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-coverage.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-coverage.rkt @@ -117,7 +117,3 @@ (test-line t) got (test-uncovered t))))))))) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-save-file.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-save-file.rkt index aab6aa133d..ca73cc9c13 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-save-file.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/teaching-lang-save-file.rkt @@ -46,7 +46,3 @@ (delete-file fn) (unless (equal? result "1\n> ") (error 'save-teaching-lang-file.rkt "expected the program to produce 1 (followed by the prompt), got ~s" result))))))) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teachpack.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/teachpack.rkt index d4616ef81d..90a13fe02e 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/teachpack.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/teachpack.rkt @@ -274,7 +274,3 @@ (test-built-in-teachpacks)) (fire-up-drracket-and-run-tests run-test) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/drracket-pkgs/drracket-test/tests/drracket/test-engine-test.rkt b/pkgs/drracket-pkgs/drracket-test/tests/drracket/test-engine-test.rkt index ffcc71f394..a2a8f574e8 100644 --- a/pkgs/drracket-pkgs/drracket-test/tests/drracket/test-engine-test.rkt +++ b/pkgs/drracket-pkgs/drracket-test/tests/drracket/test-engine-test.rkt @@ -522,5 +522,4 @@ (module+ test (module config info - (define lock-name "gui") (define timeout 480))) diff --git a/pkgs/games/paint-by-numbers/raw-problems/build-solution-sets.rkt b/pkgs/games/paint-by-numbers/raw-problems/build-solution-sets.rkt index b65062fb85..7aed452b6c 100644 --- a/pkgs/games/paint-by-numbers/raw-problems/build-solution-sets.rkt +++ b/pkgs/games/paint-by-numbers/raw-problems/build-solution-sets.rkt @@ -288,7 +288,3 @@ The col and row type specs are in sig.rkt and the solution type is: ',(solve name rows cols)))) problems))))))))))) sets) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/actual-bigger.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/actual-bigger.rkt index ecead3ae6e..7c767553e9 100644 --- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/actual-bigger.rkt +++ b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/actual-bigger.rkt @@ -33,7 +33,3 @@ (>= (send vpb1 get-aligned-min-height) (send vpb2 get-aligned-min-height) (snip-height es)) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-snip-lib.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-snip-lib.rkt index 899a7840df..a1449dcbca 100644 --- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-snip-lib.rkt +++ b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test-snip-lib.rkt @@ -126,7 +126,3 @@ (send frame show #f)) ;; (printf "tests done\n") - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test.rkt index 5e3da15e44..087829fa70 100644 --- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test.rkt +++ b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test.rkt @@ -145,7 +145,3 @@ (send frame show #f) (printf "done\n") - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test2.rkt b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test2.rkt index 2280a996d6..c804b6570c 100644 --- a/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test2.rkt +++ b/pkgs/gui-pkgs/gui-lib/mrlib/private/aligned-pasteboard/tests/test2.rkt @@ -112,7 +112,3 @@ (send frame show #f) (printf "done\n") - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/gui-pkgs/gui-test/framework/tests/main.rkt b/pkgs/gui-pkgs/gui-test/framework/tests/main.rkt index 513f89ff11..14e625d92b 100644 --- a/pkgs/gui-pkgs/gui-test/framework/tests/main.rkt +++ b/pkgs/gui-pkgs/gui-test/framework/tests/main.rkt @@ -121,5 +121,4 @@ (module+ test (module config info - (define lock-name "gui") (define timeout 360))) diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/full-scene-visible.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/full-scene-visible.rkt index 6d9fca73c3..c67acc1d5d 100644 --- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/full-scene-visible.rkt +++ b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/full-scene-visible.rkt @@ -13,7 +13,3 @@ (see-full-rectangle 3 2:rectangle) (see-full-rectangle 3 1:rectangle) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-universe-with-limit.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-universe-with-limit.rkt index 414ca71654..02b46c1996 100644 --- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-universe-with-limit.rkt +++ b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/on-tick-universe-with-limit.rkt @@ -6,7 +6,3 @@ (on-tick (lambda (w) (make-bundle (add1 w) '() '())) 1/28 3) (on-msg (lambda (w sender msg) (make-bundle w '() '()))) (on-new cons)) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-robby.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-robby.rkt index da264c01b1..15f9503631 100644 --- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-robby.rkt +++ b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/perform-robby.rkt @@ -19,7 +19,3 @@ (stop-when zero?)) (printf "done\n") - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/random-seed-works.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/random-seed-works.rkt index a5a681424c..c07703d482 100644 --- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/random-seed-works.rkt +++ b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/random-seed-works.rkt @@ -17,4 +17,6 @@ (stop-when (λ (l) (>= (length l) 2))))) (define *color 'blue) -(check-equal? (main) (begin (set! *color 'red) (main))) \ No newline at end of file +(check-equal? (main) (begin (set! *color 'red) (main))) + +(module test racket/base) diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record-stop-when.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record-stop-when.rkt index ed63fd50ba..90bb416478 100644 --- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record-stop-when.rkt +++ b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record-stop-when.rkt @@ -32,7 +32,3 @@ (unless (image=? (crop 0 0 100 100 i) j) (eprintf "this test needs to be revised -- the way 'world' writes images adds an extra pixel -- think! \n")) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record.rkt index 0f250af13c..cd0dff53c2 100644 --- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record.rkt +++ b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/record.rkt @@ -39,7 +39,3 @@ (create-n-images 3 3 "images3/") (create-n-images 0 0 "images0/") - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/release.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/release.rkt index 3983b84895..6ba26a4476 100644 --- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/release.rkt +++ b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/release.rkt @@ -28,7 +28,3 @@ 1 n))))) (main 1) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/struct-universe.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/struct-universe.rkt index 8ba889a7b7..90b1d29312 100644 --- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/struct-universe.rkt +++ b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/struct-universe.rkt @@ -54,5 +54,4 @@ (module+ test (module config info - (define lock-name "gui") (define random? #t))) diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/ufo-rename.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/ufo-rename.rkt index d46a2184b4..54c0fd0912 100644 --- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/ufo-rename.rkt +++ b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/ufo-rename.rkt @@ -13,7 +13,3 @@ (uni:on-tick add1) (uni:stop-when (lambda (y) (>= y 100))) (uni:on-draw create-UFO-scene)) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-restart.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-restart.rkt index 17eef4f298..06a2ac76ea 100644 --- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-restart.rkt +++ b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/universe-restart.rkt @@ -45,7 +45,3 @@ (launch-many-worlds (u) (w "one") (w "two") (w "three"))) ; (require (submod "." drop-bad)) - -(module+ test - (module config info - (define lock-name "gui"))) diff --git a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/world0-stops.rkt b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/world0-stops.rkt index 5617260eb9..4e7b6a5c71 100644 --- a/pkgs/htdp-pkgs/htdp-test/2htdp/tests/world0-stops.rkt +++ b/pkgs/htdp-pkgs/htdp-test/2htdp/tests/world0-stops.rkt @@ -25,7 +25,3 @@ (test (big-bang (stop-with 0) (on-tick add1) (to-draw (draw ""))) 0 "") (test (big-bang 0 (on-draw (draw 0)) (stop-when zero? (draw 1))) 0 "1") - -(module+ test - (module config info - (define lock-name "gui")))