From d2bdc2eca89d6fc040be0f9eb892f0ca49aa50fe Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Sat, 20 Feb 2010 12:23:01 +0000 Subject: [PATCH] fix test problems svn: r18221 --- collects/tests/future/future.ss | 2 +- collects/tests/future/random-future.ss | 11 ++++++----- collects/tests/info.ss | 1 + collects/tests/mzscheme/filelib.ss | 16 ++++++++-------- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/collects/tests/future/future.ss b/collects/tests/future/future.ss index 139fc96969..a7d72b642a 100644 --- a/collects/tests/future/future.ss +++ b/collects/tests/future/future.ss @@ -1,4 +1,4 @@ -(load-relative "loadtest.ss") +(load-relative "../mzscheme/loadtest.ss") (Section 'future) (require scheme/future) diff --git a/collects/tests/future/random-future.ss b/collects/tests/future/random-future.ss index 8375be9396..ceb691a76f 100644 --- a/collects/tests/future/random-future.ss +++ b/collects/tests/future/random-future.ss @@ -186,8 +186,9 @@ Errors/exceptions and other kinds of control? (define-namespace-anchor ns-here) (let loop ([n 100]) - (printf ".") (flush-output) - (let ([p (gen-prog)]) - (pretty-print p) - (eval p (namespace-anchor->namespace ns-here))) - (loop (- n 1))) + (unless (zero? n) + (printf ".") (flush-output) + (let ([p (gen-prog)]) + (pretty-print p) + (eval p (namespace-anchor->namespace ns-here))) + (loop (- n 1)))) diff --git a/collects/tests/info.ss b/collects/tests/info.ss index 2e13c2c61a..ff6700f7a2 100644 --- a/collects/tests/info.ss +++ b/collects/tests/info.ss @@ -8,6 +8,7 @@ '("2htdp" "aligned-pasteboard" "deinprogramm" + "future" "honu" "match" "macro-debugger" diff --git a/collects/tests/mzscheme/filelib.ss b/collects/tests/mzscheme/filelib.ss index c266201cc9..f0128c8374 100644 --- a/collects/tests/mzscheme/filelib.ss +++ b/collects/tests/mzscheme/filelib.ss @@ -80,9 +80,9 @@ (bytesbytes a) (path->bytes b)))))]) (test #t equal? (sort rel) (sort rel2)) - (when (eq? (system-type) 'unix) - (system "ln -s filelib.ss filelib-link.ss") - (system "ln -s . loop-link") + (unless (eq? (system-type) 'windows) + (make-file-or-directory-link "filelib.ss" "filelib-link") + (make-file-or-directory-link "." "loop-link") (test (+ 2 (length rel2)) fold-files @@ -92,7 +92,7 @@ [(file-exists? name) 'file] [(directory-exists? name) 'dir] [else '???])) - (when (member name '("filelib-link.ss" "loop-link")) + (when (member name '("filelib-link" "loop-link")) (test kind name 'link)) (add1 accum)) 0 @@ -107,14 +107,14 @@ [(file-exists? name) 'file] [(directory-exists? name) 'dir] [else '???])) - (when (member name '("filelib-link.ss" "loop-link")) + (when (member name '("filelib-link" "loop-link")) (test kind name 'link)) (values (add1 accum) #t)) 0 #f #f) - (system "rm loop-link") + (delete-file "loop-link") (test (+ 1 (length rel2)) fold-files @@ -122,14 +122,14 @@ (test kind values (cond [(file-exists? name) 'file] [else 'dir])) - (when (member name '("filelib-link.ss")) + (when (member name '("filelib-link")) (test kind name 'file)) (add1 accum)) 0 #f #t) - (system "rm filelib-link.ss") + (delete-file "filelib-link") 'done))))