From 0fa2e6d7d53f8c1042ab955f728a4b400fcde05c Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Fri, 24 Aug 2012 07:41:05 -0500 Subject: [PATCH] adjust planet tests to use 'raco planet' command-line tool, not 'planet' --- collects/tests/planet/cmdline-tool.rkt | 8 ++++---- collects/tests/planet/submod.rkt | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/collects/tests/planet/cmdline-tool.rkt b/collects/tests/planet/cmdline-tool.rkt index 77fad598ad..6b91ccb523 100644 --- a/collects/tests/planet/cmdline-tool.rkt +++ b/collects/tests/planet/cmdline-tool.rkt @@ -13,11 +13,11 @@ using 'system' to call out to the tool and then reading its results, etc. (define debug? #f) -(define planet-bin-path +(define raco-bin-path (simplify-path (build-path (collection-path "racket") 'up 'up (if (eq? (system-type) 'windows) - "planet.exe" - (build-path "bin" "planet"))))) + "raco.exe" + (build-path "bin" "raco"))))) (define test-connection-spec '("planet" "test-connection.plt" "1" "0")) (define test-connection.plt-cache @@ -32,7 +32,7 @@ using 'system' to call out to the tool and then reading its results, etc. (parameterize ([current-input-port (open-input-string "")] [current-output-port sp] [current-error-port sp]) - (apply system* planet-bin-path args)) + (apply system* raco-bin-path "planet" args)) (when debug? (display (get-output-string sp))) (get-output-string sp))) diff --git a/collects/tests/planet/submod.rkt b/collects/tests/planet/submod.rkt index d523527b79..8f4434cc92 100644 --- a/collects/tests/planet/submod.rkt +++ b/collects/tests/planet/submod.rkt @@ -1,13 +1,13 @@ #lang racket (require setup/dirs) -(define planet (build-path (find-console-bin-dir) - (if (eq? 'windows (system-type)) - "planet.exe" - "planet"))) +(define raco (build-path (find-console-bin-dir) + (if (eq? 'windows (system-type)) + "raco.exe" + "raco"))) (void - (system* planet "link" "racket-tester" "p1.plt" "1" "0" + (system* raco "planet" "link" "racket-tester" "p1.plt" "1" "0" (path->string (collection-path "tests" "racket" "embed-planet-1")))) (define (test expected got) @@ -34,5 +34,5 @@ (test #t (module-declared? `(submod (planet racket-tester/p1/has-sub) the-sub) #t)) (void - (system* planet "unlink" "racket-tester" "p1.plt" "1" "0")) + (system* raco "planet" "unlink" "racket-tester" "p1.plt" "1" "0"))