moved the teaching language test suites to their own directory

collects/tests/htdp-lang/advanced.rktl

@@ -2,7 +2,7 @@
 ;; Basic checks for the advanced language. See also
 ;;  beginner.ss
 
-(load-relative "loadtest.rktl")
+(load-relative "../racket/loadtest.rktl")
 
 ;; Don't need these:
 (define no-extra-if-tests? #t)

collects/tests/htdp-lang/beginner-abbr.rktl

@@ -10,7 +10,7 @@
 ;; Don't try to run other tests from the test suite after loading this
 ;; one into a particular namespace.
 
-(load-relative "loadtest.rktl")
+(load-relative "../racket/loadtest.rktl")
 
 ;; Don't need these:
 (define no-extra-if-tests? #t)

collects/tests/htdp-lang/beginner.rktl

@@ -49,7 +49,7 @@
 ;;     removes the last <n> added expressions
 ;;
 
-(load-relative "loadtest.rktl")
+(load-relative "../racket/loadtest.rktl")
 
 ;; Check that expansion doesn't introduce non-equal ids that
 ;;  claim to be "original" at the same place

collects/tests/htdp-lang/htdp-image.rktl

@@ -1,6 +1,6 @@
 ;; Load this one with GRacket
 
-(load-relative "loadtest.rktl")
+(load-relative "../racket/loadtest.rktl")
 (require teachpack/htdp/image
          htdp/error
          lang/posn

collects/tests/htdp-lang/htdp.rktl

@@ -0,0 +1,15 @@
+(let ([ol (current-load)]) 
+  (current-load
+   (λ x
+     (printf "cl ~s\n" x)
+     (apply ol x))))
+   
+(load-relative "../racket/loadtest.rktl")
+
+(load-in-sandbox "beginner.rktl" #:testing "../racket/testing.rktl") 
+(load-in-sandbox "beginner-abbr.rktl" #:testing "../racket/testing.rktl")
+(load-in-sandbox "intermediate.rktl" #:testing "../racket/testing.rktl")
+(load-in-sandbox "intermediate-lambda.rktl" #:testing "../racket/testing.rktl")
+(load-in-sandbox "advanced.rktl" #:testing "../racket/testing.rktl")
+
+(report-errs)

collects/tests/htdp-lang/intermediate-lambda.rktl

@@ -2,7 +2,7 @@
 ;; Basic checks for the intermediate language. See also
 ;;  beginner.rktl
 
-(load-relative "loadtest.rktl")
+(load-relative "../racket/loadtest.rktl")
 
 ;; Don't need these:
 (define no-extra-if-tests? #t)

collects/tests/htdp-lang/intermediate.rktl

@@ -2,7 +2,7 @@
 ;; Basic checks for the intermediate language. See also
 ;;  beginner.rktl
 
-(load-relative "loadtest.rktl")
+(load-relative "../racket/loadtest.rktl")
 
 ;; Don't need these:
 (define no-extra-if-tests? #t)

collects/tests/racket/htdp.rktl

@@ -1,10 +0,0 @@
-
-(load-relative "loadtest.rktl")
-
-(load-in-sandbox "beginner.rktl")
-(load-in-sandbox "beginner-abbr.rktl")
-(load-in-sandbox "intermediate.rktl")
-(load-in-sandbox "intermediate-lambda.rktl")
-(load-in-sandbox "advanced.rktl")
-
-(report-errs)

collects/tests/racket/testing.rktl

@@ -74,7 +74,7 @@ transcript.
 (define number-of-error-tests 0)
 (define number-of-exn-tests 0)
 
-(define (load-in-sandbox file)
+(define (load-in-sandbox file #:testing [testing "testing.rktl"])
   (define-syntax-rule (S id) (dynamic-require 'racket/sandbox 'id))
   (let ([e ((S call-with-trusted-sandbox-configuration)
             (lambda ()
@@ -83,7 +83,7 @@ transcript.
                              [(S sandbox-error-output) current-error-port]
                              [(S sandbox-memory-limit) 100]) ; 100mb per box
                 ((S make-evaluator) '(begin) #:requires (list 'racket)))))])
-    (e `(load-relative "testing.rktl"))
+    (e `(load-relative ,testing))
     (e `(define real-output-port (quote ,real-output-port)))
     (e `(define real-error-port  (quote ,real-error-port)))
     (e `(define Section-prefix ,Section-prefix))