From 74702c1f942df909b6b5da15a3064df8893c8bec Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sun, 29 Dec 2013 10:29:19 -0600 Subject: [PATCH] move "props" test configs to `test` submodules or "info.rkt" files The "props" file still has * ".rkt" `drdr:timeout` entries, needed until DrDr uses submodules and "info.rkt" files; although timeout information has been put in submodules for `raco test`, DrDr uses `raco test` in a way that does not enable timeouts, so that DrDr can implement timeouts itself (and record when a test times out) * ".rkt" `drdr:random #t` entries; not sure what to do with these, yet * ".rkt" `responsible` entries; not sure what to do with these, yet * ".rktl" `drdr:command-line #f` entries, needed until all ".rktl" files are disabled in DrDr The following files were previously disabled for DrDr testing, but were intentionally left as enabled with these changes: pkgs/racket-pkgs/racket-test/tests/pkg/shelly.rkt pkgs/racket-pkgs/racket-test/tests/pkg/util.rkt pkgs/racket-pkgs/racket-test/tests/pkg/info.rkt pkgs/racket-pkgs/racket-test/tests/pkg/basic-index.rkt pkgs/racket-pkgs/racket-test/tests/racket/link.rkt pkgs/racket-pkgs/racket-test/tests/racket/embed-in-c.rkt pkgs/racket-pkgs/racket-doc/ffi/examples/use-c-printf.rkt pkgs/racket-pkgs/racket-doc/ffi/examples/c-printf.rkt pkgs/parser-tools-pkgs/parser-tools-lib/parser-tools/private-lex/error-tests.rkt pkgs/mysterx/mysterx.rkt pkgs/mysterx/main.rkt pkgs/games/gobblet/test-model.rkt pkgs/games/gobblet/test-explore.rkt pkgs/games/gobblet/robot.rkt pkgs/games/gobblet/check.rkt pkgs/db-pkgs/db-lib/db/private/odbc/main.rkt pkgs/db-pkgs/db-lib/db/private/odbc/ffi.rkt pkgs/db-pkgs/db-lib/db/private/odbc/dbsystem.rkt pkgs/db-pkgs/db-lib/db/private/odbc/connection.rkt pkgs/distributed-places-pkgs/distributed-places-lib/racket/place/distributed/examples/hello-world.rkt pkgs/redex-pkgs/redex-lib/redex/private/compiler/match.rkt pkgs/redex-pkgs/redex-lib/redex/private/compiler/match.rkt pkgs/htdp-pkgs/htdp-test/2htdp/utest/balls.rkt pkgs/gui-pkgs/gui-test/framework/tests/test-suite-utils.rkt pkgs/games/paint-by-numbers/raw-problems/size-calculation.rkt pkgs/db-pkgs/db-lib/db/odbc.rkt pkgs/compatibility-pkgs/compatibility-lib/mzlib/traceld.rkt pkgs/cext-lib/dynext/private/stdio.rkt pkgs/db-pkgs/db-lib/db/odbc.rkt racket/collects/ffi/unsafe/objc.rkt racket/collects/ffi/objc.rkt pkgs/racket-pkgs/racket-test/tests/pkg/tests-db.rkt pkgs/racket-pkgs/racket-test/tests/pkg/test-docs.rkt pkgs/racket-pkgs/racket-test/tests/pkg/test-catalogs-api.rkt pkgs/gui-pkg-manager-pkgs/gui-pkg-manager-lib/pkg/gui/main.rkt pkgs/redex-pkgs/redex-lib/redex/private/compiler/redextomatrix.rkt pkgs/typed-racket-pkgs/typed-racket-lib/typed-racket/base-env/base-special-env.rkt pkgs/planet-pkgs/planet-test/tests/planet/version.rkt pkgs/planet-pkgs/planet-test/tests/planet/test-docs-complete.rkt pkgs/planet-pkgs/planet-test/tests/planet/lang.rkt pkgs/planet-pkgs/planet-test/tests/planet/docs-build.rkt pkgs/drracket-pkgs/drracket-test/tests/drracket/follow-log.rkt pkgs/drracket-pkgs/drracket/drracket/private/dock-icon.rkt pkgs/drracket-pkgs/drracket-test/tests/drracket/tool-lib-and-sig.rkt original commit: e226ad66c5fb6095d5702e5c47f5c7cf73e914f5 --- .../compiler-lib/compiler/commands/exe-dir.rkt | 2 ++ pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe.rkt | 2 ++ pkgs/compiler-pkgs/compiler-lib/compiler/commands/make.rkt | 2 ++ pkgs/compiler-pkgs/compiler-lib/compiler/commands/pack.rkt | 1 + .../compiler-lib/compiler/demodularizer/batch.rkt | 2 ++ .../compiler-test/tests/compiler/embed/embed-me9.rkt | 5 ++++- .../compiler-test/tests/compiler/embed/info.rkt | 4 ++++ .../compiler-test/tests/compiler/zo-test-worker.rkt | 2 ++ pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test.rkt | 6 ++++++ 9 files changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe-dir.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe-dir.rkt index dae09d1438..acc3b94919 100644 --- a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe-dir.rkt +++ b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe-dir.rkt @@ -29,3 +29,5 @@ #:copy-collects (exe-dir-add-collects-dirs)) (when (verbose) (printf " [output to \"~a\"]\n" dest-dir)) + +(module test racket/base) diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe.rkt index e1241b11f1..305879651f 100644 --- a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe.rkt +++ b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/exe.rkt @@ -140,3 +140,5 @@ (exe-aux)))]) (when (verbose) (printf " [output to \"~a\"]\n" dest))) + +(module test racket/base) diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/make.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/make.rkt index b998b0e7c8..74fd5ff6ce 100644 --- a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/make.rkt +++ b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/make.rkt @@ -7,6 +7,8 @@ setup/parallel-build racket/match) +(module test racket/base) + (define verbose (make-parameter #f)) (define very-verbose (make-parameter #f)) (define disable-inlining (make-parameter #f)) diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/pack.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/pack.rkt index eba5bf0865..ebb56ae73a 100644 --- a/pkgs/compiler-pkgs/compiler-lib/compiler/commands/pack.rkt +++ b/pkgs/compiler-pkgs/compiler-lib/compiler/commands/pack.rkt @@ -96,3 +96,4 @@ (when (verbose) (printf " [output to \"~a\"]\n" plt-output)))) +(module test racket/base) diff --git a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/batch.rkt b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/batch.rkt index 6ec08d76ec..456ded38e7 100644 --- a/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/batch.rkt +++ b/pkgs/compiler-pkgs/compiler-lib/compiler/demodularizer/batch.rkt @@ -57,3 +57,5 @@ Here's the idea: (garbage-collect-toplevels-enabled #t)] #:args (filename) (demodularize filename (output-file)))) + +(module test racket/base) diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me9.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me9.rkt index 877eed97de..cdb4847278 100644 --- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me9.rkt +++ b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/embed-me9.rkt @@ -3,4 +3,7 @@ (with-output-to-file "stdout" (lambda () (printf "~a\n" (ex))) - 'append)) + 'append) + + (module test racket/base)) + diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/info.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/info.rkt index 7882f9f179..538a0e0b38 100644 --- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/info.rkt +++ b/pkgs/compiler-pkgs/compiler-test/tests/compiler/embed/info.rkt @@ -12,3 +12,7 @@ "embed-isl.rkt" "embed-isll.rkt" "embed-asl.rkt")) + +(define test-omit-paths '("embed-me9.rkt" + "embed-planet-1" + "embed-planet-2")) diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test-worker.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test-worker.rkt index e46284548d..8be85d8121 100644 --- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test-worker.rkt +++ b/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test-worker.rkt @@ -268,3 +268,5 @@ (command-line #:program "zo-test-worker" #:args (file) (run-test file)) + +(module test racket/base) diff --git a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test.rkt b/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test.rkt index 20158c5404..6bd475bbaa 100755 --- a/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test.rkt +++ b/pkgs/compiler-pkgs/compiler-test/tests/compiler/zo-test.rkt @@ -227,3 +227,9 @@ exec racket -t "$0" -- -s -t 60 -v -R $* (printf "~a:\n~a\n\n" (car p) (cdr p))))))))) (thread-wait final-thread) + +;; Test mode: +(module test racket/base + (require syntax/location) + (parameterize ([current-command-line-arguments (vector "-I" "-S" "-t" "60" "-v" "-R")]) + (dynamic-require (quote-module-path "..") #f)))