From fba54e27afb3e3bb653ab9bb7cbdb22482cd27e6 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Mon, 19 Oct 2009 21:28:17 +0000 Subject: [PATCH] Cleaning up cwd access for DrDr svn: r16373 --- collects/schemeunit/check-test.ss | 7 +++++-- collects/schemeunit/test-test.ss | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/collects/schemeunit/check-test.ss b/collects/schemeunit/check-test.ss index 1e5d1ff26b..576252500e 100644 --- a/collects/schemeunit/check-test.ss +++ b/collects/schemeunit/check-test.ss @@ -29,6 +29,7 @@ #lang scheme/base (require + scheme/runtime-path (lib "list.ss" "srfi" "1") (file "check.ss") (file "result.ss") @@ -50,6 +51,8 @@ (define-check (bad) (fail-check)) +(define-runtime-path check-file "check.ss") + (define check-tests (test-suite "Check tests" @@ -288,7 +291,7 @@ (cns (current-namespace))) (parameterize ((current-namespace destns)) (namespace-require '(for-syntax scheme/base)) - (namespace-require '(file "check.ss")) + (namespace-require `(file ,(path->string check-file))) ;; First check that the right check macro got ;; used: ie that it didn't just compile the thing ;; as an application. @@ -303,7 +306,7 @@ ;; is writable (let ((stx-string "(check = 1 2)")) (write (compile (read-syntax - (string->path "file") + check-file (open-input-string stx-string))) (open-output-string)))))) diff --git a/collects/schemeunit/test-test.ss b/collects/schemeunit/test-test.ss index 37e350bc1c..a0dd35e084 100644 --- a/collects/schemeunit/test-test.ss +++ b/collects/schemeunit/test-test.ss @@ -2,7 +2,8 @@ (require (for-syntax scheme/base)) -(require srfi/1 +(require scheme/runtime-path + srfi/1 srfi/13) (require (file "test.ss") @@ -24,6 +25,8 @@ "Example 3" #t))) +(define-runtime-path test-file "test.ss") + (define-check (check-test-results test successes failures errors) (let ((results (run-test test))) (check = (length results) (+ successes failures errors)) @@ -44,7 +47,7 @@ (let ((destns (make-base-namespace)) (cns (current-namespace))) (parameterize ((current-namespace destns)) - (namespace-require '(file "test.ss")) + (namespace-require `(file ,(path->string test-file))) (check-exn (lambda (e) (check-pred exn:fail:syntax? e) (check string-contains (exn-message e) msg))