From 0940a4d8137e633fec35ad53d209c42e05822127 Mon Sep 17 00:00:00 2001 From: Eli Barzilay Date: Mon, 17 May 2010 01:57:41 -0400 Subject: [PATCH] Rename "test-drscheme.ss" -> "test-drracket.rkt"; remove the framework tests. There's no point keeping the framework tests when drdr does a better job with running more stuff. But keep the drracket test, just in case, to get an additional nag when something bad happens and it doesn't start. --- collects/meta/build/build | 6 ++---- .../build/{test-drscheme.ss => test-drracket.rkt} | 15 ++++++--------- 2 files changed, 8 insertions(+), 13 deletions(-) rename collects/meta/build/{test-drscheme.ss => test-drracket.rkt} (86%) diff --git a/collects/meta/build/build b/collects/meta/build/build index 129496a766..72a06db4be 100755 --- a/collects/meta/build/build +++ b/collects/meta/build/build @@ -138,7 +138,7 @@ webdir="web" # script for patching files with current version info versionpatcher="$scriptdir/versionpatch" # DrScheme test script -drtestscript="$scriptdir/test-drscheme.ss" +drtestscript="$scriptdir/test-drracket.rkt" # bundling script bundlescript="$scriptdir/bundle" # web build script @@ -1260,11 +1260,9 @@ DO_BUILD() { # inputs -- releasing # GRacket-based tests on the main machine, in an Xvnc session if [[ "$machine" = "$workmachine" ]]; then - separator "${machine}(${platform}) running GRacket tests" + separator "${machine}(${platform}) testing DrRacket" _start_xvnc dont_exit _timeout_run 60 env HOME="$testdir" "$PLTHOME/$drtestscript" - dont_exit _timeout_run 300 env HOME="$testdir" \ - "$PLTHOME/collects/tests/framework/framework-test" _end_xvnc fi diff --git a/collects/meta/build/test-drscheme.ss b/collects/meta/build/test-drracket.rkt similarity index 86% rename from collects/meta/build/test-drscheme.ss rename to collects/meta/build/test-drracket.rkt index 2b5ea2f90d..b7cea9a277 100755 --- a/collects/meta/build/test-drscheme.ss +++ b/collects/meta/build/test-drracket.rkt @@ -1,11 +1,9 @@ #!/bin/sh #| -*- scheme -*- -exec "$PLTHOME/bin/mred" "$0" +exec "$PLTHOME/bin/gracket" "$0" |# -#lang mzscheme - -(require (lib "mred.ss" "mred") (lib "class.ss") (lib "port.ss") (lib "file.ss")) +#lang racket/gui ;; save the original error port to send messages (define stderr (current-error-port)) @@ -23,7 +21,7 @@ exec "$PLTHOME/bin/mred" "$0" (die "uncaught exception: ~a\n" (if (exn? e) (exn-message e) e))) (define-values (in out) (make-pipe)) -(thread +((compose void thread) (lambda () (let* ([bytes (make-bytes 1000)] [len/eof (sync (read-bytes-avail!-evt bytes in))]) @@ -39,17 +37,16 @@ exec "$PLTHOME/bin/mred" "$0" (define es (make-eventspace)) (current-eventspace es) -(thread (lambda () (sleep 60) (die "timeout!"))) +(void (thread (lambda () (sleep 60) (die "timeout!")))) ;; make sure the preferences are such that we don't get the welcome screen (cleanup) (make-directory (find-system-path 'pref-dir)) -(with-output-to-file (find-system-path 'pref-file) +(with-output-to-file (find-system-path 'pref-file) #:exists 'truncate (lambda () (printf "~s\n" `((plt:framework-prefs ((drscheme:last-version ,(version)) - (drscheme:last-language english)))))) - 'truncate) + (drscheme:last-language english))))))) ;; start drscheme (queue-callback