From 40b69a9a8045d5a36d5c3bd2d24903dd309680ed 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 --- .../typed-racket-test/tests/typed-racket/info.rkt | 4 ++++ .../typed-racket-test/tests/typed-racket/nightly-run.rkt | 3 +++ .../tests/typed-racket/optimizer/transform.rkt | 3 +++ .../typed-racket-test/tests/typed-racket/run.rkt | 8 ++++++++ .../tests/typed-racket/succeed/submodules.rkt | 5 +++++ 5 files changed, 23 insertions(+) create mode 100644 pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/info.rkt diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/info.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/info.rkt new file mode 100644 index 00000000..802d7d6d --- /dev/null +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/info.rkt @@ -0,0 +1,4 @@ +#lang info + +(define test-omit-paths '("fail" + "xfail")) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/nightly-run.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/nightly-run.rkt index 04691b9c..2ca63ca5 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/nightly-run.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/nightly-run.rkt @@ -1,5 +1,8 @@ #lang racket/base +(module test racket/base + (displayln "run as program for tests")) + (require racket/runtime-path) (define-runtime-path run "run.rkt") (parameterize ([current-command-line-arguments '#("--nightly")]) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt index 71868687..4f41e417 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/optimizer/transform.rkt @@ -2,6 +2,9 @@ (require "run.rkt" "../send-places.rkt") +(module test racket/base + (displayln "run as program for tests")) + ;; Assuming that only the log format changed, update test files to the ;; new format. ;; Running this after changes to the behavior of the optimizer is a diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/run.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/run.rkt index 07458d0c..5b48c640 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/run.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/run.rkt @@ -47,3 +47,11 @@ (unless (= 0 ((exec) to-run)) (eprintf "Typed Racket Tests did not pass.\n") (exit 1)))) + +;; Test mode: +(module test racket/base + (require syntax/location) + (parameterize ([current-command-line-arguments (vector "--nightly")]) + (dynamic-require (quote-module-path "..") 0)) + (module config info + (define timeout 1800))) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/submodules.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/submodules.rkt index 5893ff7c..2b5e4893 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/submodules.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/succeed/submodules.rkt @@ -9,3 +9,8 @@ (g (assert (string->number (vector-ref (current-command-line-arguments) 0))))) +;; Test mode: +(module test racket/base + (require syntax/location) + (parameterize ([current-command-line-arguments (vector "1")]) + (dynamic-require (quote-module-path "..") #f)))