fix some tests that need to find `racket'

original commit: 4492cf2555
This commit is contained in:
Matthew Flatt 2013-08-02 12:08:26 -06:00
parent b7f32c3cf3
commit 3a67e505ba
2 changed files with 7 additions and 5 deletions

View File

@ -1,6 +1,7 @@
#lang racket #lang racket
(require tests/eli-tester (require tests/eli-tester
racket/runtime-path) racket/runtime-path
compiler/find-exe)
(define (capture-output command . args) (define (capture-output command . args)
(define o (open-output-string)) (define o (open-output-string))
@ -14,7 +15,7 @@
(define (test-on-program filename) (define (test-on-program filename)
; run modular program, capture output ; run modular program, capture output
(define-values (modular-output modular-error) (define-values (modular-output modular-error)
(capture-output (find-executable-path "racket") filename)) (capture-output (find-exe) filename))
(define demod-filename (define demod-filename
(let-values ([(base filename dir?) (split-path filename)]) (let-values ([(base filename dir?) (split-path filename)])
@ -25,11 +26,11 @@
; demodularize ; demodularize
(parameterize ([current-input-port (open-input-string "")]) (parameterize ([current-input-port (open-input-string "")])
(system* (find-executable-path "raco") "demod" "-o" demod-filename filename)) (system* (find-exe) "-l-" "raco" "demod" "-o" demod-filename filename))
; run whole program ; run whole program
(define-values (whole-output whole-error) (define-values (whole-output whole-error)
(capture-output (find-executable-path "racket") demod-filename)) (capture-output (find-exe) demod-filename))
; compare output ; compare output
(test (test

View File

@ -7,6 +7,7 @@ exec racket -t "$0" -- -s -t 60 -v -R $*
(require setup/dirs (require setup/dirs
racket/runtime-path racket/runtime-path
racket/future racket/future
compiler/find-exe
"zo-test-util.rkt") "zo-test-util.rkt")
(define ((make-recorder! ht) file phase) (define ((make-recorder! ht) file phase)
@ -63,7 +64,7 @@ exec racket -t "$0" -- -s -t 60 -v -R $*
(! p-str)])) (! p-str)]))
(define-runtime-path zo-test-worker-path "zo-test-worker.rkt") (define-runtime-path zo-test-worker-path "zo-test-worker.rkt")
(define racket-path (path->string (find-executable-path "racket"))) (define racket-path (path->string (find-exe)))
(define p (define p
(command-line #:program "zo-test" (command-line #:program "zo-test"