From 306a8b4e7b1baa65577537d520954eacddf37a54 Mon Sep 17 00:00:00 2001 From: Eric Dobson Date: Tue, 8 Oct 2013 23:15:53 -0700 Subject: [PATCH] Make test files have mains that run the test case defined in them. original commit: 6bf7c4efd4c513c8143806f9f578ce1ba44010cd --- .../tests/typed-racket/unit-tests/contract-tests.rkt | 1 + .../tests/typed-racket/unit-tests/infer-tests.rkt | 2 +- .../tests/typed-racket/unit-tests/interactive-tests.rkt | 2 ++ .../typed-racket/unit-tests/keyword-expansion-test.rkt | 1 + .../tests/typed-racket/unit-tests/parse-type-tests.rkt | 1 + .../typed-racket/unit-tests/remove-intersect-tests.rkt | 1 + .../unit-tests/special-env-typecheck-tests.rkt | 1 + .../tests/typed-racket/unit-tests/subst-tests.rkt | 1 + .../tests/typed-racket/unit-tests/subtype-tests.rkt | 1 + .../tests/typed-racket/unit-tests/test-utils.rkt | 9 ++++++++- .../tests/typed-racket/unit-tests/type-equal-tests.rkt | 1 + .../tests/typed-racket/unit-tests/typecheck-tests.rkt | 2 ++ 12 files changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/contract-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/contract-tests.rkt index bba1ace9..52ba81c7 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/contract-tests.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/contract-tests.rkt @@ -8,6 +8,7 @@ (types abbrev numeric-tower union) rackunit) (provide tests) +(gen-test-main) (define-syntax-rule (t e) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/infer-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/infer-tests.rkt index eef31089..ad47e4c9 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/infer-tests.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/infer-tests.rkt @@ -3,8 +3,8 @@ rackunit (types numeric-tower utils abbrev)) - (provide tests) +(gen-test-main) (define-syntax-rule (fv-t ty elems ...) (let ([ty* ty]) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/interactive-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/interactive-tests.rkt index 9fbf79f5..847aca94 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/interactive-tests.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/interactive-tests.rkt @@ -1,6 +1,7 @@ #lang racket/base (require + "test-utils.rkt" racket/base racket/port racket/promise @@ -11,6 +12,7 @@ syntax/parse)) (provide tests) +(gen-test-main) (define promised-ns (delay diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/keyword-expansion-test.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/keyword-expansion-test.rkt index b465c518..b2cd5388 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/keyword-expansion-test.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/keyword-expansion-test.rkt @@ -6,6 +6,7 @@ racket/match racket/set rackunit) (provide tests) +(gen-test-main) (define-syntax-rule (t arg expected) (begin diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/parse-type-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/parse-type-tests.rkt index 16929879..542acc93 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/parse-type-tests.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/parse-type-tests.rkt @@ -13,6 +13,7 @@ racket/dict) (provide tests) +(gen-test-main) ;; HORRIBLE HACK! ;; We are solving the following problem: diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/remove-intersect-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/remove-intersect-tests.rkt index 71dbaa35..3dc44afe 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/remove-intersect-tests.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/remove-intersect-tests.rkt @@ -5,6 +5,7 @@ (types abbrev numeric-tower subtype union remove-intersect) rackunit) (provide tests) +(gen-test-main) (define-syntax (over-tests stx) (syntax-case stx () diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt index d65d7a34..ad634f15 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt @@ -23,6 +23,7 @@ typed-racket/base-env/base-types (for-syntax typed-racket/standard-inits)) (provide tests) +(gen-test-main) (begin-for-syntax (do-standard-inits)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subst-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subst-tests.rkt index dd61a69f..944dab22 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subst-tests.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subst-tests.rkt @@ -5,6 +5,7 @@ (types utils abbrev numeric-tower substitute) rackunit) (provide tests) +(gen-test-main) (define-syntax-rule (s img var tgt result) (test-eq? "test" (substitute img 'var tgt) result)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subtype-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subtype-tests.rkt index 3f581469..76828af6 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subtype-tests.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/subtype-tests.rkt @@ -8,6 +8,7 @@ (for-syntax scheme/base)) (provide tests) +(gen-test-main) (define-syntax (subtyping-tests stx) (define (single-test stx) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt index ccbb8f9b..5e2b8cc7 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt @@ -4,7 +4,7 @@ scheme/match scheme/gui/dynamic typed-racket/utils/utils - (for-syntax scheme/base) + (for-syntax scheme/base syntax/parse) (types utils) (rep type-rep) rackunit rackunit/text-ui) @@ -25,3 +25,10 @@ (syntax-case stx () [(_ nm a b) (syntax/loc stx (test-case nm (check-tc-result-equal?* a b)))])) + +(define-syntax gen-test-main + (syntax-parser + [(stx:id) + #`(module* main #f + (require rackunit/text-ui) + (void (run-tests #,(datum->syntax #'stx 'tests))))])) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-equal-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-equal-tests.rkt index 96ba0bd5..9485b79f 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-equal-tests.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/type-equal-tests.rkt @@ -6,6 +6,7 @@ rackunit) (provide tests) +(gen-test-main) (define (-base x) (make-Base x #'dummy values #f)) diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/typecheck-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/typecheck-tests.rkt index b96c5884..5f1bc855 100644 --- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/typecheck-tests.rkt +++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/typecheck-tests.rkt @@ -55,12 +55,14 @@ (require "evaluator.rkt" + "test-utils.rkt" (for-syntax racket/base syntax/parse 'tester)) (provide tests) +(gen-test-main) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;