From 33e1cd058df8ecd0c4286da7672328e96f5085e5 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 --- .../rackunit-doc/rackunit/scribblings/info.rkt | 3 +++ pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/log.rkt | 7 +++++++ .../rackunit-pkgs/rackunit-test/tests/rackunit/pr10950.rkt | 7 +++++++ .../rackunit-test/tests/rackunit/run-tests.rkt | 7 +++++++ .../rackunit-test/tests/rackunit/standalone-check-test.rkt | 4 ++++ .../tests/rackunit/standalone-test-case-test.rkt | 4 ++++ .../rackunit-test/tests/rackunit/standalone.rkt | 7 +++++++ 7 files changed, 39 insertions(+) create mode 100644 pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/info.rkt diff --git a/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/info.rkt b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/info.rkt new file mode 100644 index 0000000..42edee6 --- /dev/null +++ b/pkgs/rackunit-pkgs/rackunit-doc/rackunit/scribblings/info.rkt @@ -0,0 +1,3 @@ +#lang info + +(define test-omit-paths '("file-test.rkt")) diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/log.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/log.rkt index 53841e9..3176846 100644 --- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/log.rkt +++ b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/log.rkt @@ -2,6 +2,13 @@ (require rackunit rackunit/log) +(module test racket/base + (require syntax/location) + ;; Use a separate namespace to avoid logging results + ;; in this namespace (where `raco test` would see errors). + (parameterize ([current-namespace (make-base-namespace)]) + (dynamic-require (quote-module-path "..") #f))) + (define-syntax-rule (&& label stdout-e stdout-p) (let () (define stdout-ev stdout-e) diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/pr10950.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/pr10950.rkt index e07a898..5dc237e 100644 --- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/pr10950.rkt +++ b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/pr10950.rkt @@ -20,3 +20,10 @@ (regexp-quote "pr10950.rkt:14:51") (regexp-quote "0 success(es) 1 failure(s) 0 error(s) 1 test(s) run\n"))) output)) + +(module test racket/base + (require syntax/location) + ;; Use a separate namespace to avoid logging results + ;; in this namespace (where `raco test` would see errors). + (parameterize ([current-namespace (make-base-namespace)]) + (dynamic-require (quote-module-path "..") #f))) \ No newline at end of file diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/run-tests.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/run-tests.rkt index 18553fc..b8329f8 100644 --- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/run-tests.rkt +++ b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/run-tests.rkt @@ -10,3 +10,10 @@ (parameterize ([current-error-port (current-output-port)] [current-output-port (current-error-port)]) (run-tests failure-tests)) + +(module test racket/base + (require syntax/location) + ;; Use a separate namespace to avoid logging results + ;; in this namespace (where `raco test` would see errors). + (parameterize ([current-namespace (make-base-namespace)]) + (dynamic-require (quote-module-path "..") #f))) \ No newline at end of file diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-check-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-check-test.rkt index 6187e38..0570e8b 100644 --- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-check-test.rkt +++ b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-check-test.rkt @@ -33,6 +33,10 @@ (require rackunit/private/check) +;; Don't run this test automatically: +(module test racket/base + (displayln "run as program for tests")) + ;; This check should succeed (check = 1 1 0.0) diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-test-case-test.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-test-case-test.rkt index 78f9abc..36540c5 100644 --- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-test-case-test.rkt +++ b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone-test-case-test.rkt @@ -7,6 +7,10 @@ (require rackunit/private/check rackunit/private/test-case) +;; Don't run this test automatically: +(module test racket/base + (displayln "run as program for tests")) + ;; These tests should succeeds (test-begin (check-eq? 1 1)) (test-case "succeed" (check-eq? 1 1)) diff --git a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone.rkt b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone.rkt index 744e2cb..fc920b4 100644 --- a/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone.rkt +++ b/pkgs/rackunit-pkgs/rackunit-test/tests/rackunit/standalone.rkt @@ -3,6 +3,13 @@ rackunit racket/path) +(module test racket/base + (require syntax/location) + ;; Use a separate namespace to avoid logging results + ;; in this namespace (where `raco test` would see errors). + (parameterize ([current-namespace (make-base-namespace)]) + (dynamic-require (quote-module-path "..") #f))) + (define-runtime-path here ".") (define collects (normalize-path (build-path here ".." "..")))