suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

_timeout_run doesn't want to work nicely on windows, so dump it and stay

Browse Source 
with only the timeout in the racket script.

This makes `_timeout_run' redundant, but leave it around in case there
is some future need for it.
This commit is contained in:
Eli Barzilay 2010-12-12 03:39:01 -05:00
parent c65a2ba9ab
commit 1d9d490374
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
collects/meta/build/build
View File

@ -738,8 +738,8 @@ _kill() { # args: pid [process name]
if [[ ! -d "/proc/$pid" ]]; then return; fi if [[ ! -d "/proc/$pid" ]]; then return; fi
show "Killing $desc" show "Killing $desc"
kill -15 "$pid" > /dev/null 2>& 1; if [[ ! -d "/proc/$pid" ]]; then return; fi kill -15 "$pid" > /dev/null 2>& 1; if [[ ! -d "/proc/$pid" ]]; then return; fi
usleep 500000 ; if [[ ! -d "/proc/$pid" ]]; then return; fi sleep 0.5 ; if [[ ! -d "/proc/$pid" ]]; then return; fi
usleep 500000 ; if [[ ! -d "/proc/$pid" ]]; then return; fi sleep 0.5 ; if [[ ! -d "/proc/$pid" ]]; then return; fi
sleep 1 ; if [[ ! -d "/proc/$pid" ]]; then return; fi sleep 1 ; if [[ ! -d "/proc/$pid" ]]; then return; fi
echo "re-killing $desc" echo "re-killing $desc"
kill -15 "$pid" > /dev/null 2>& 1; if [[ ! -d "/proc/$pid" ]]; then return; fi kill -15 "$pid" > /dev/null 2>& 1; if [[ ! -d "/proc/$pid" ]]; then return; fi
@ -805,10 +805,10 @@ _start_xvnc() {
-rfbauth "$HOME/.vnc/passwd" \ -rfbauth "$HOME/.vnc/passwd" \
-br \ -br \
> "$xvnclog" 2>&1 & > "$xvnclog" 2>&1 &
Xvncpid="$!"; usleep 500000 Xvncpid="$!"; sleep 0.5
echo "Xvnc running ($Xvncpid)" echo "Xvnc running ($Xvncpid)"
metacity --sm-disable & metacity --sm-disable &
Xwmpid="$!"; usleep 500000 Xwmpid="$!"; sleep 0.5
echo "window manager running ($Xwmpid)" echo "window manager running ($Xwmpid)"
# to see the window, uncomment this # to see the window, uncomment this
# DISPLAY="$real_DISPLAY" vncviewer ::6565 -PasswordFile "$HOME/.vnc/passwd" & # DISPLAY="$real_DISPLAY" vncviewer ::6565 -PasswordFile "$HOME/.vnc/passwd" &
@ -1226,11 +1226,10 @@ DO_BUILD() { # inputs -- releasing
if [[ "$test_gui" = "yes" ]]; then if [[ "$test_gui" = "yes" ]]; then
separator "${machine}(${platform}) testing DrRacket" separator "${machine}(${platform}) testing DrRacket"
if [[ "$platform" = *"-win32" ]]; then if [[ "$platform" = *"-win32" ]]; then
dont_exit _timeout_run 120 "$PLTHOME/gracket.exe" \ dont_exit "$PLTHOME/gracket.exe" "$(cygpath -w "$PLTHOME/$drtestscript")"
"$(cygpath -w "$PLTHOME/$drtestscript")"
else else
_start_xvnc _start_xvnc
dont_exit _timeout_run 60 env HOME="$testdir" "$PLTHOME/$drtestscript" dont_exit env HOME="$testdir" "$PLTHOME/$drtestscript"
_end_xvnc _end_xvnc
fi fi
fi fi

2
collects/meta/build/test-drracket.rkt
View File

@ -37,7 +37,7 @@ exec "$PLTHOME/bin/gracket" "$0"
(define es (make-eventspace)) (define es (make-eventspace))
(current-eventspace es) (current-eventspace es)
(void (thread (lambda () (sleep 60) (die "timeout!")))) (void (thread (lambda () (sleep 120) (die "timeout!"))))
;; make sure the preferences are such that we don't get the welcome screen ;; make sure the preferences are such that we don't get the welcome screen
(cleanup) (cleanup)