Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regression test for sandboxed evaluation #176

Merged
merged 3 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions qi-lib/flow/core/passes.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
(provide (for-syntax define-and-register-pass
run-passes))

(begin-for-syntax
(module macro-debug racket/base
;; See tests/compiler/rules/full-cycle.rkt for an explanation
;; re: sandboxed evaluation, submodules and test coverage.
(provide my-emit-local-step)

(define my-emit-local-step
;; See "Breaking Out of the Sandbox"
Expand All @@ -15,7 +18,11 @@
(make-keyword-procedure
(lambda (kws kw-args . rest)
(void))))))
(dynamic-require 'macro-debugger/emit 'emit-local-step)))
(dynamic-require 'macro-debugger/emit 'emit-local-step))))

(require (for-syntax 'macro-debug))

(begin-for-syntax

;; Could be a list but for future extensibility a custom struct is
;; probably a better idea.
Expand Down
3 changes: 2 additions & 1 deletion qi-lib/flow/extended/forms.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
syntax/parse/define
"expander.rkt"
"../../macro.rkt"
"../space.rkt"
(only-in "../space.rkt"
define-for-qi)
"impl.rkt")

;;; Predicates
Expand Down
1 change: 1 addition & 0 deletions qi-test/info.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
(define build-deps '("rackunit-lib"
"adjutor"
"math-lib"
"sandbox-lib"
"qi-lib"))
(define clean '("compiled" "tests/compiled" "tests/private/compiled"))
22 changes: 7 additions & 15 deletions qi-test/tests/compiler/rules/full-cycle.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,15 @@
rackunit/text-ui
syntax/macro-testing
qi/flow/core/deforest
qi/flow/core/compiler
"private/deforest-util.rkt"
(submod qi/flow/extended/expander invoke))

(begin-for-syntax
(require syntax/parse/define
(for-template qi/flow/core/compiler)
(for-syntax racket/base))

;; A macro that accepts surface syntax, expands it, and then applies the
;; indicated optimization passes.
(define-syntax-parser test-compile~>
[(_ stx)
#'(expand-flow stx)]
[(_ stx pass ... passN)
#'(passN
(test-compile~> stx pass ...))]))
;; A function that expands and compiles surface syntax
(define (qi-compile stx)
(compile-flow
(expand-flow stx))))


(define tests
Expand All @@ -39,9 +32,8 @@
(test-true "normalize → deforest"
(deforested?
(phase1-eval
(test-compile~> #'(~>> (filter odd?) values (map sqr))
normalize-pass
deforest-pass)))))))
(qi-compile
#'(~>> (filter odd?) values (map sqr)))))))))

(module+ main
(void
Expand Down
25 changes: 24 additions & 1 deletion qi-test/tests/flow.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
racket/string
racket/function
racket/format
racket/sandbox
(except-in "private/util.rkt"
add-two)
syntax/macro-testing)
Expand Down Expand Up @@ -1657,7 +1658,29 @@
(thunk
((☯ (== _ _ _))
3)))
(test-equal? "relay-_" ((☯ _) 3) 3))))))
(test-equal? "relay-_" ((☯ _) 3) 3))))

(test-suite
"regression tests"
(test-suite
"sandboxed evaluation"
(test-not-exn "Plays well with sandboxed evaluation"
;; See "Breaking Out of the Sandbox"
;; https://github.com/drym-org/qi/wiki/Qi-Meeting-Mar-29-2024
;;
;; This test reproduces the bug and the fix fixes it. Yet,
;; coverage does not show the lambda in `my-emit-local-step`
;; as being covered. This could be because the constructed
;; sandbox evaluator "covering" the code doesn't count as
;; coverage by the main evaluator running the test?
;; We address this by putting `my-emit-local-step` in a
;; submodule, which, by default, are ignored by coverage.
(lambda ()
(let ([eval (make-evaluator
'racket/base
'(require qi))])
(eval
'(☯ add1)))))))))

(module+ main
(void (run-tests tests)))
Loading