diff --git a/collects/scribble/eval.ss b/collects/scribble/eval.ss index 34c67f645c..5c2b193c2d 100644 --- a/collects/scribble/eval.ss +++ b/collects/scribble/eval.ss @@ -244,7 +244,8 @@ [sandbox-error-output 'string] [sandbox-eval-limits #f] [sandbox-memory-limit #f] - [sandbox-make-inspector current-inspector]) + [sandbox-make-inspector current-inspector] + [sandbox-make-code-inspector current-code-inspector]) (make-evaluator '(begin (require scheme/base))))) (define (close-eval e) diff --git a/collects/tests/mzscheme/testing.ss b/collects/tests/mzscheme/testing.ss index 318d9fdf8b..9ba18ea5c5 100644 --- a/collects/tests/mzscheme/testing.ss +++ b/collects/tests/mzscheme/testing.ss @@ -77,17 +77,16 @@ transcript. (define number-of-exn-tests 0) (define (load-in-sandbox file) - (let ([e (parameterize ([(dynamic-require 'scheme/sandbox 'sandbox-security-guard) - (current-security-guard)] - [(dynamic-require 'scheme/sandbox 'sandbox-input) - current-input-port] - [(dynamic-require 'scheme/sandbox 'sandbox-output) - current-output-port] - [(dynamic-require 'scheme/sandbox 'sandbox-error-output) - current-error-port] - [(dynamic-require 'scheme/sandbox 'sandbox-eval-limits) - #f]) - ((dynamic-require 'scheme/sandbox 'make-evaluator) '(begin) #:requires (list 'scheme)))]) + (define-syntax-rule (S id) (dynamic-require 'scheme/sandbox 'id)) + (let ([e (parameterize ([(S sandbox-security-guard) (current-security-guard)] + [(S sandbox-input) current-input-port] + [(S sandbox-output) current-output-port] + [(S sandbox-error-output) current-error-port] + [(S sandbox-make-inspector) current-inspector] + [(S sandbox-make-code-inspector) current-code-inspector] + [(S sandbox-memory-limit) 100] ; 100mb per box + [(S sandbox-eval-limits) #f]) + ((S make-evaluator) '(begin) #:requires (list 'scheme)))]) (e `(load-relative "testing.ss")) (e `(define real-error-port (quote ,real-error-port))) (e `(define Section-prefix ,Section-prefix))