better test starter script, and make it work on platforms other than macosx

svn: r9732

collects/tests/framework/README

@@ -1,7 +1,7 @@
 (#|
 		      Framework Test Suite Overview
 
-Each tests will rely on the sucessfully completion of all of the ones
+Each test will rely on the sucessfully completion of all of the ones
 before it. In addition, all test suites rely on the sucessful
 completion of the engine test suites and the mzscheme test suites.
 
@@ -9,18 +9,14 @@ All of these tests reside in PLTHOME/collects/tests/framework/
 
 There will be a main mzscheme process which will start up a new mred
 as necessary for the test suites. Since some tests actually require
-mred to exit in order to pass, this governor is required. 
+mred to exit in order to pass, this governor is required.
 
 To run a test use:
 
    framework-test <test.ss> ...
 
-where or <test.ss> is the name of one of the tests below.
-(Note: uncomment the launcher entries in info.ss for this.)
-Alternatively, pass no command-line arguments to run all of
-the tests. (Under windows, the app will be named "Framework
-Test"; see the mred-launcher-names documentation for how the
-names change on the various platforms)
+where <test.ss> is the name of one of the tests below.  Alternatively,
+pass no command-line arguments to run all of the tests.
 
 Some of the tests in this file are not yet present in the
 testing directory. They are planned future expansions of

collects/tests/framework/framework-test

@@ -1,3 +1,5 @@
-#!/bin/sh
+#!/bin/bash
 
-exec mred main.ss "$@"
+here="$(dirname "$(readlink -f "$0")")"
+
+exec "$here/../../../bin/mzscheme" "$here/main.ss" "$@"

collects/tests/framework/test-suite-utils.ss

@@ -83,21 +83,18 @@
 
   (define (restart-mred)
     (shutdown-mred)
-    (case (system-type)
-      [(macosx)
-       (thread
-        (lambda ()
-          (system*
-           (path->string
-            (build-path (collection-path "scheme")
-                        'up
-                        'up
-                        "bin" 
-                        "mred"))
-           (path->string 
-            (build-path (collection-path "tests" "framework")
-                        "framework-test-engine.ss")))))]
-      [else (error 'test-suite-utils.ss "don't know how to start mred")])
+    (thread
+     (lambda ()
+       (system*
+        (path->string
+         (build-path
+          (let-values ([(dir exe _)
+                        (split-path (find-system-path 'exec-file))])
+            dir)
+          (if (eq? 'windows (system-type)) "MrEd.exe" "mred")))
+        (path->string
+         (build-path (collection-path "tests" "framework")
+                     "framework-test-engine.ss")))))
     (debug-printf mz-tcp "accepting listener~n")
     (let-values ([(in out) (tcp-accept listener)])
       (set! in-port in)