diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-conjugate-top.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-conjugate-top.rkt deleted file mode 100644 index 98896f9b..00000000 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-conjugate-top.rkt +++ /dev/null @@ -1,4 +0,0 @@ -#lang typed/scheme -#:optimize -(require racket/unsafe/ops) -(conjugate (+ 1.0+2.0i 2.0+4.0i)) diff --git a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-fixnum.rkt b/collects/tests/typed-scheme/optimizer/generic/inexact-complex-fixnum.rkt deleted file mode 100644 index 11a63667..00000000 --- a/collects/tests/typed-scheme/optimizer/generic/inexact-complex-fixnum.rkt +++ /dev/null @@ -1,4 +0,0 @@ -#lang typed/scheme -#:optimize -(require racket/unsafe/ops) -(+ (quotient 2 1) 1.0+2.0i 3.0+6.0i) diff --git a/collects/tests/typed-scheme/optimizer/run.rkt b/collects/tests/typed-scheme/optimizer/run.rkt index f171ce05..e3080a9c 100644 --- a/collects/tests/typed-scheme/optimizer/run.rkt +++ b/collects/tests/typed-scheme/optimizer/run.rkt @@ -7,7 +7,7 @@ (call-with-trusted-sandbox-configuration (lambda () (parameterize ([current-load-relative-directory - (build-path here "generic")] + (build-path here "tests")] [sandbox-memory-limit #f] ; TR needs memory [sandbox-output 'string] [sandbox-namespace-specs @@ -28,7 +28,7 @@ out))))) (define (generate-opt-log name) - (parameterize ([current-load-relative-directory (build-path here "generic")] + (parameterize ([current-load-relative-directory (build-path here "tests")] [current-command-line-arguments '#("--log-optimizations")]) (with-output-to-string (lambda () @@ -60,11 +60,11 @@ (let ((n-failures (if (> (vector-length (current-command-line-arguments)) 0) - (if (test (format "generic/~a.rkt" + (if (test (format "tests/~a.rkt" (vector-ref (current-command-line-arguments) 0))) 0 1) (for/fold ((n-failures 0)) - ((gen (in-directory (build-path here "generic")))) + ((gen (in-directory (build-path here "tests")))) (+ n-failures (if (test gen) 0 1)))))) (unless (= n-failures 0) (error (format "~a tests failed." n-failures)))) diff --git a/collects/tests/typed-scheme/optimizer/generic/apply-plus.rkt b/collects/tests/typed-scheme/optimizer/tests/apply-plus.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/apply-plus.rkt rename to collects/tests/typed-scheme/optimizer/tests/apply-plus.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/begin-float.rkt b/collects/tests/typed-scheme/optimizer/tests/begin-float.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/begin-float.rkt rename to collects/tests/typed-scheme/optimizer/tests/begin-float.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/binary-fixnum.rkt b/collects/tests/typed-scheme/optimizer/tests/binary-fixnum.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/binary-fixnum.rkt rename to collects/tests/typed-scheme/optimizer/tests/binary-fixnum.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/binary-nonzero-fixnum.rkt b/collects/tests/typed-scheme/optimizer/tests/binary-nonzero-fixnum.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/binary-nonzero-fixnum.rkt rename to collects/tests/typed-scheme/optimizer/tests/binary-nonzero-fixnum.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/box.rkt b/collects/tests/typed-scheme/optimizer/tests/box.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/box.rkt rename to collects/tests/typed-scheme/optimizer/tests/box.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/cross-module-struct.rkt b/collects/tests/typed-scheme/optimizer/tests/cross-module-struct.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/cross-module-struct.rkt rename to collects/tests/typed-scheme/optimizer/tests/cross-module-struct.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/cross-module-struct2.rkt b/collects/tests/typed-scheme/optimizer/tests/cross-module-struct2.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/cross-module-struct2.rkt rename to collects/tests/typed-scheme/optimizer/tests/cross-module-struct2.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/dead-else.rkt b/collects/tests/typed-scheme/optimizer/tests/dead-else.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/dead-else.rkt rename to collects/tests/typed-scheme/optimizer/tests/dead-else.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/dead-substructs.rkt b/collects/tests/typed-scheme/optimizer/tests/dead-substructs.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/dead-substructs.rkt rename to collects/tests/typed-scheme/optimizer/tests/dead-substructs.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/dead-then.rkt b/collects/tests/typed-scheme/optimizer/tests/dead-then.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/dead-then.rkt rename to collects/tests/typed-scheme/optimizer/tests/dead-then.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/define-begin-float.rkt b/collects/tests/typed-scheme/optimizer/tests/define-begin-float.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/define-begin-float.rkt rename to collects/tests/typed-scheme/optimizer/tests/define-begin-float.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/define-call-float.rkt b/collects/tests/typed-scheme/optimizer/tests/define-call-float.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/define-call-float.rkt rename to collects/tests/typed-scheme/optimizer/tests/define-call-float.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/define-float.rkt b/collects/tests/typed-scheme/optimizer/tests/define-float.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/define-float.rkt rename to collects/tests/typed-scheme/optimizer/tests/define-float.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/define-pair.rkt b/collects/tests/typed-scheme/optimizer/tests/define-pair.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/define-pair.rkt rename to collects/tests/typed-scheme/optimizer/tests/define-pair.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/different-langs.rkt b/collects/tests/typed-scheme/optimizer/tests/different-langs.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/different-langs.rkt rename to collects/tests/typed-scheme/optimizer/tests/different-langs.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/double-float.rkt b/collects/tests/typed-scheme/optimizer/tests/double-float.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/double-float.rkt rename to collects/tests/typed-scheme/optimizer/tests/double-float.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/exact-inexact.rkt b/collects/tests/typed-scheme/optimizer/tests/exact-inexact.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/exact-inexact.rkt rename to collects/tests/typed-scheme/optimizer/tests/exact-inexact.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/fixnum-comparison.rkt b/collects/tests/typed-scheme/optimizer/tests/fixnum-comparison.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/fixnum-comparison.rkt rename to collects/tests/typed-scheme/optimizer/tests/fixnum-comparison.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/float-comp.rkt b/collects/tests/typed-scheme/optimizer/tests/float-comp.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/float-comp.rkt rename to collects/tests/typed-scheme/optimizer/tests/float-comp.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/float-fun.rkt b/collects/tests/typed-scheme/optimizer/tests/float-fun.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/float-fun.rkt rename to collects/tests/typed-scheme/optimizer/tests/float-fun.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/float-promotion.rkt b/collects/tests/typed-scheme/optimizer/tests/float-promotion.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/float-promotion.rkt rename to collects/tests/typed-scheme/optimizer/tests/float-promotion.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/flvector-length.rkt b/collects/tests/typed-scheme/optimizer/tests/flvector-length.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/flvector-length.rkt rename to collects/tests/typed-scheme/optimizer/tests/flvector-length.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/fx-fl.rkt b/collects/tests/typed-scheme/optimizer/tests/fx-fl.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/fx-fl.rkt rename to collects/tests/typed-scheme/optimizer/tests/fx-fl.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/in-bytes.rkt b/collects/tests/typed-scheme/optimizer/tests/in-bytes.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/in-bytes.rkt rename to collects/tests/typed-scheme/optimizer/tests/in-bytes.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/in-list.rkt b/collects/tests/typed-scheme/optimizer/tests/in-list.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/in-list.rkt rename to collects/tests/typed-scheme/optimizer/tests/in-list.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/in-string.rkt b/collects/tests/typed-scheme/optimizer/tests/in-string.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/in-string.rkt rename to collects/tests/typed-scheme/optimizer/tests/in-string.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/in-vector.rkt b/collects/tests/typed-scheme/optimizer/tests/in-vector.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/in-vector.rkt rename to collects/tests/typed-scheme/optimizer/tests/in-vector.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-binary-nonzero-fixnum.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-binary-nonzero-fixnum.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/invalid-binary-nonzero-fixnum.rkt rename to collects/tests/typed-scheme/optimizer/tests/invalid-binary-nonzero-fixnum.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-exact-inexact.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-exact-inexact.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/invalid-exact-inexact.rkt rename to collects/tests/typed-scheme/optimizer/tests/invalid-exact-inexact.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-float-comp.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-float-comp.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/invalid-float-comp.rkt rename to collects/tests/typed-scheme/optimizer/tests/invalid-float-comp.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-float-promotion.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-float-promotion.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/invalid-float-promotion.rkt rename to collects/tests/typed-scheme/optimizer/tests/invalid-float-promotion.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-inexact-complex-parts.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-inexact-complex-parts.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/invalid-inexact-complex-parts.rkt rename to collects/tests/typed-scheme/optimizer/tests/invalid-inexact-complex-parts.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-make-flrectangular.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-make-flrectangular.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/invalid-make-flrectangular.rkt rename to collects/tests/typed-scheme/optimizer/tests/invalid-make-flrectangular.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-make-polar.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-make-polar.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/invalid-make-polar.rkt rename to collects/tests/typed-scheme/optimizer/tests/invalid-make-polar.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-mpair.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-mpair.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/invalid-mpair.rkt rename to collects/tests/typed-scheme/optimizer/tests/invalid-mpair.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-sqrt.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-sqrt.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/invalid-sqrt.rkt rename to collects/tests/typed-scheme/optimizer/tests/invalid-sqrt.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-unboxed-let.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-unboxed-let.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/invalid-unboxed-let.rkt rename to collects/tests/typed-scheme/optimizer/tests/invalid-unboxed-let.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-unboxed-let2.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-unboxed-let2.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/invalid-unboxed-let2.rkt rename to collects/tests/typed-scheme/optimizer/tests/invalid-unboxed-let2.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-vector-ref.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-vector-ref.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/invalid-vector-ref.rkt rename to collects/tests/typed-scheme/optimizer/tests/invalid-vector-ref.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/invalid-vector-set.rkt b/collects/tests/typed-scheme/optimizer/tests/invalid-vector-set.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/invalid-vector-set.rkt rename to collects/tests/typed-scheme/optimizer/tests/invalid-vector-set.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/known-vector-length.rkt b/collects/tests/typed-scheme/optimizer/tests/known-vector-length.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/known-vector-length.rkt rename to collects/tests/typed-scheme/optimizer/tests/known-vector-length.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/let-float.rkt b/collects/tests/typed-scheme/optimizer/tests/let-float.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/let-float.rkt rename to collects/tests/typed-scheme/optimizer/tests/let-float.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/let-rhs.rkt b/collects/tests/typed-scheme/optimizer/tests/let-rhs.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/let-rhs.rkt rename to collects/tests/typed-scheme/optimizer/tests/let-rhs.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/literal-int.rkt b/collects/tests/typed-scheme/optimizer/tests/literal-int.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/literal-int.rkt rename to collects/tests/typed-scheme/optimizer/tests/literal-int.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/magnitude.rkt b/collects/tests/typed-scheme/optimizer/tests/magnitude.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/magnitude.rkt rename to collects/tests/typed-scheme/optimizer/tests/magnitude.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/make-flrectangular.rkt b/collects/tests/typed-scheme/optimizer/tests/make-flrectangular.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/make-flrectangular.rkt rename to collects/tests/typed-scheme/optimizer/tests/make-flrectangular.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/make-polar.rkt b/collects/tests/typed-scheme/optimizer/tests/make-polar.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/make-polar.rkt rename to collects/tests/typed-scheme/optimizer/tests/make-polar.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/maybe-exact-complex.rkt b/collects/tests/typed-scheme/optimizer/tests/maybe-exact-complex.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/maybe-exact-complex.rkt rename to collects/tests/typed-scheme/optimizer/tests/maybe-exact-complex.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/mpair.rkt b/collects/tests/typed-scheme/optimizer/tests/mpair.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/mpair.rkt rename to collects/tests/typed-scheme/optimizer/tests/mpair.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/n-ary-float.rkt b/collects/tests/typed-scheme/optimizer/tests/n-ary-float.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/n-ary-float.rkt rename to collects/tests/typed-scheme/optimizer/tests/n-ary-float.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/nested-float.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-float.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/nested-float.rkt rename to collects/tests/typed-scheme/optimizer/tests/nested-float.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/nested-float2.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-float2.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/nested-float2.rkt rename to collects/tests/typed-scheme/optimizer/tests/nested-float2.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/nested-let-loop.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-let-loop.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/nested-let-loop.rkt rename to collects/tests/typed-scheme/optimizer/tests/nested-let-loop.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/nested-pair1.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-pair1.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/nested-pair1.rkt rename to collects/tests/typed-scheme/optimizer/tests/nested-pair1.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/nested-pair2.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-pair2.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/nested-pair2.rkt rename to collects/tests/typed-scheme/optimizer/tests/nested-pair2.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/nested-unboxed-let.rkt b/collects/tests/typed-scheme/optimizer/tests/nested-unboxed-let.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/nested-unboxed-let.rkt rename to collects/tests/typed-scheme/optimizer/tests/nested-unboxed-let.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/one-arg-arith.rkt b/collects/tests/typed-scheme/optimizer/tests/one-arg-arith.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/one-arg-arith.rkt rename to collects/tests/typed-scheme/optimizer/tests/one-arg-arith.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/pair-fun.rkt b/collects/tests/typed-scheme/optimizer/tests/pair-fun.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/pair-fun.rkt rename to collects/tests/typed-scheme/optimizer/tests/pair-fun.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/quote.rkt b/collects/tests/typed-scheme/optimizer/tests/quote.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/quote.rkt rename to collects/tests/typed-scheme/optimizer/tests/quote.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/real-part-loop.rkt b/collects/tests/typed-scheme/optimizer/tests/real-part-loop.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/real-part-loop.rkt rename to collects/tests/typed-scheme/optimizer/tests/real-part-loop.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/simple-float.rkt b/collects/tests/typed-scheme/optimizer/tests/simple-float.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/simple-float.rkt rename to collects/tests/typed-scheme/optimizer/tests/simple-float.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/simple-pair.rkt b/collects/tests/typed-scheme/optimizer/tests/simple-pair.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/simple-pair.rkt rename to collects/tests/typed-scheme/optimizer/tests/simple-pair.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/sqrt-segfault.rkt b/collects/tests/typed-scheme/optimizer/tests/sqrt-segfault.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/sqrt-segfault.rkt rename to collects/tests/typed-scheme/optimizer/tests/sqrt-segfault.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/sqrt.rkt b/collects/tests/typed-scheme/optimizer/tests/sqrt.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/sqrt.rkt rename to collects/tests/typed-scheme/optimizer/tests/sqrt.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/string-length.rkt b/collects/tests/typed-scheme/optimizer/tests/string-length.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/string-length.rkt rename to collects/tests/typed-scheme/optimizer/tests/string-length.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/structs.rkt b/collects/tests/typed-scheme/optimizer/tests/structs.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/structs.rkt rename to collects/tests/typed-scheme/optimizer/tests/structs.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unary-fixnum-nested.rkt b/collects/tests/typed-scheme/optimizer/tests/unary-fixnum-nested.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unary-fixnum-nested.rkt rename to collects/tests/typed-scheme/optimizer/tests/unary-fixnum-nested.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unary-fixnum.rkt b/collects/tests/typed-scheme/optimizer/tests/unary-fixnum.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unary-fixnum.rkt rename to collects/tests/typed-scheme/optimizer/tests/unary-fixnum.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unary-float.rkt b/collects/tests/typed-scheme/optimizer/tests/unary-float.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unary-float.rkt rename to collects/tests/typed-scheme/optimizer/tests/unary-float.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-for.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-for.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-for.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions1.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions1.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions1.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions1.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions2.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions2.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions2.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions2.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions3.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions3.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions3.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions3.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions4.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions4.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions4.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions4.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions5.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions5.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions5.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions5.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions6.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions6.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions6.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions6.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions7.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions7.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions7.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions7.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions8.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions8.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-let-functions8.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-let-functions8.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-let.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-let.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let2.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let2.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-let2.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-let2.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-let3.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-let3.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-let3.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-let3.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-letrec-syntaxes+values.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-letrec-syntaxes+values.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-letrec-syntaxes+values.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-letrec-syntaxes+values.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-letrec.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-letrec.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-letrec.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-letrec.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/unboxed-make-rectangular.rkt b/collects/tests/typed-scheme/optimizer/tests/unboxed-make-rectangular.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/unboxed-make-rectangular.rkt rename to collects/tests/typed-scheme/optimizer/tests/unboxed-make-rectangular.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-length-nested.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-length-nested.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/vector-length-nested.rkt rename to collects/tests/typed-scheme/optimizer/tests/vector-length-nested.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-length.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-length.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/vector-length.rkt rename to collects/tests/typed-scheme/optimizer/tests/vector-length.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-ref-set-ref.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-ref-set-ref.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/vector-ref-set-ref.rkt rename to collects/tests/typed-scheme/optimizer/tests/vector-ref-set-ref.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-ref.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-ref.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/vector-ref.rkt rename to collects/tests/typed-scheme/optimizer/tests/vector-ref.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-ref2.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-ref2.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/vector-ref2.rkt rename to collects/tests/typed-scheme/optimizer/tests/vector-ref2.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-set-quote.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-set-quote.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/vector-set-quote.rkt rename to collects/tests/typed-scheme/optimizer/tests/vector-set-quote.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-set.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-set.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/vector-set.rkt rename to collects/tests/typed-scheme/optimizer/tests/vector-set.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/vector-set2.rkt b/collects/tests/typed-scheme/optimizer/tests/vector-set2.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/vector-set2.rkt rename to collects/tests/typed-scheme/optimizer/tests/vector-set2.rkt diff --git a/collects/tests/typed-scheme/optimizer/generic/zero.rkt b/collects/tests/typed-scheme/optimizer/tests/zero.rkt similarity index 100% rename from collects/tests/typed-scheme/optimizer/generic/zero.rkt rename to collects/tests/typed-scheme/optimizer/tests/zero.rkt