From 63671d3b68ead8a1506860d7fdbbc09c988bd8e3 Mon Sep 17 00:00:00 2001 From: Burke Fetscher Date: Sat, 27 Jul 2013 13:41:48 -0500 Subject: [PATCH] fix examples path in run-tests.rkt --- pkgs/redex-pkgs/redex-test/info.rkt | 3 ++- .../redex-test/redex/tests/run-tests.rkt | 27 +++++++++++-------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/redex-pkgs/redex-test/info.rkt b/pkgs/redex-pkgs/redex-test/info.rkt index e09d588571..01b714492d 100644 --- a/pkgs/redex-pkgs/redex-test/info.rkt +++ b/pkgs/redex-pkgs/redex-test/info.rkt @@ -10,5 +10,6 @@ "gui-lib" "pict-lib" "redex-lib" - "scribble-lib")) + "scribble-lib" + "redex-examples")) (define build-deps '()) diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt index 494c821502..58207bfa86 100644 --- a/pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt +++ b/pkgs/redex-pkgs/redex-test/redex/tests/run-tests.rkt @@ -5,6 +5,7 @@ (require racket/runtime-path racket/cmdline racket/match + pkg/lib "test-util.rkt" "bitmap-test-util.rkt") @@ -37,19 +38,20 @@ "enum-test.rkt" "bitmap-test.rkt") (if test-examples? - '("../examples/cbn-letrec.rkt" - "../examples/stlc.rkt" - "../examples/pi-calculus.rkt" - "../examples/list-machine/test.rkt" - ("../examples/beginner.rkt" main) - "../examples/racket-machine/reduction-test.rkt" - "../examples/racket-machine/verification-test.rkt" - "../examples/delim-cont/test.rkt" - "../examples/cont-mark-transform/all-test.rkt" - ("../examples/r6rs/r6rs-tests.rkt" main)) + '("/redex/examples/cbn-letrec.rkt" + "/redex/examples/stlc.rkt" + "/redex/examples/pi-calculus.rkt" + "/redex/examples/list-machine/test.rkt" + ("/redex/examples/beginner.rkt" main) + "/redex/examples/racket-machine/reduction-test.rkt" + "/redex/examples/racket-machine/verification-test.rkt" + "/redex/examples/delim-cont/test.rkt" + "/redex/examples/cont-mark-transform/all-test.rkt" + ("/redex/examples/r6rs/r6rs-tests.rkt" main)) '()))) (define-runtime-path here ".") +(define examples-path (pkg-directory "redex-examples")) (define (flush) ;; these flushes are here for running under cygwin, @@ -69,7 +71,10 @@ (flush) (printf "running ~a\n" file) (flush) - (action (dynamic-require (build-path here file) provided)) + (define path (if (regexp-match #rx"" file) + (build-path examples-path (cadr (regexp-match #rx"^/(.*)$" file))) + (build-path here file))) + (action (dynamic-require path provided)) (flush))) test-files)