diff --git a/collects/meta/drdr/config.ss b/collects/meta/drdr/config.ss index b14497b73d..02f1ec3028 100644 --- a/collects/meta/drdr/config.ss +++ b/collects/meta/drdr/config.ss @@ -9,8 +9,8 @@ (drdr-directory "/opt/svn/drdr") (git-path "/usr/bin/git") (Xvfb-path "/usr/bin/Xvfb") -(current-make-install-timeout-seconds (* 60 60)) -(current-make-timeout-seconds (* 60 60)) +(current-make-install-timeout-seconds (* 90 60)) +(current-make-timeout-seconds (* 90 60)) (current-subprocess-timeout-seconds 90) (current-monitoring-interval-seconds 60) (number-of-cpus 12) diff --git a/collects/meta/drdr/good-init.sh b/collects/meta/drdr/good-init.sh index 833be414f6..ed6c58f745 100755 --- a/collects/meta/drdr/good-init.sh +++ b/collects/meta/drdr/good-init.sh @@ -9,7 +9,7 @@ cd "$DRDR" kill_all() { cat "$LOGS/"*.pid > /tmp/leave-pids-$$ - KILL=`pgrep '^(Xvfb|fluxbox|mzscheme|mred(-text)?)$' | grep -w -v -f /tmp/leave-pids-$$` + KILL=`pgrep '^(Xvfb|fluxbox|racket|gracket(-text)?)$' | grep -w -v -f /tmp/leave-pids-$$` rm /tmp/leave-pids-$$ kill -15 $KILL sleep 2 diff --git a/collects/meta/drdr/scm.ss b/collects/meta/drdr/scm.ss index 4cd6367403..95bb4abc91 100644 --- a/collects/meta/drdr/scm.ss +++ b/collects/meta/drdr/scm.ss @@ -179,7 +179,7 @@ (define (scm-revisions-after cur-rev) (define newest-rev (newest-push)) - (for/list ([rev (in-range (add1 cur-rev) newest-rev)] + (for/list ([rev (in-range (add1 cur-rev) (add1 newest-rev))] #:when (let ([info (push-info rev)]) (and info (hash-has-key? (push-data-branches info) master-branch))))