From 96e4ddd8abb0ef0d0751b9640d41a1b60b49b367 Mon Sep 17 00:00:00 2001
From: Jay McCarthy <jay@racket-lang.org>
Date: Tue, 31 Dec 2013 10:13:42 -0700
Subject: [PATCH] Incorporate new raco test usage

---
 pkgs/plt-services/meta/drdr/metadata.rkt    | 14 +++++++-------
 pkgs/plt-services/meta/drdr/plt-build.rkt   |  2 +-
 pkgs/plt-services/meta/drdr/run-collect.rkt |  4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/plt-services/meta/drdr/metadata.rkt b/pkgs/plt-services/meta/drdr/metadata.rkt
index 354469e114..ce2fef72c6 100644
--- a/pkgs/plt-services/meta/drdr/metadata.rkt
+++ b/pkgs/plt-services/meta/drdr/metadata.rkt
@@ -6,16 +6,13 @@
 (define PROP:command-line "drdr:command-line")
 (define PROP:timeout "drdr:timeout")
 
-(define (path-command-line a-path)
+(define (path-command-line a-path a-timeout)
   (define suffix (filename-extension a-path))
   (define default-cmd
     (and suffix
          (case (string->symbol (bytes->string/utf-8 suffix))
            [(ss scm scrbl rkt sls)
-            '(raco "test" "-q" "-s" "main" "-s" "test" *)
-            '(racket *)
-            '(raco "test" *)]
-           [(rktl)                 '(racket "-f" *)]
+            `(raco "test" "-m" "--timeout" ,(number->string a-timeout) *)]
            [else                   #f])))
   (define (replace-* s)
     (cond
@@ -43,8 +40,11 @@
 (provide/contract
  [PROP:command-line string?]
  [PROP:timeout string?]
- [path-responsible (path-string? . -> . (or/c string? false/c))]
- [path-command-line (path-string? . -> . (or/c (cons/c symbol? (listof string?)) false/c))]
+ [path-responsible 
+  (path-string? . -> . (or/c string? false/c))]
+ [path-command-line 
+  (-> path-string? exact-nonnegative-integer? 
+      (or/c (cons/c symbol? (listof string?)) false/c))]
  [path-random? (path-string? . -> . boolean?)]
  [path-timeout (path-string? . -> . (or/c exact-nonnegative-integer? false/c))])
 
diff --git a/pkgs/plt-services/meta/drdr/plt-build.rkt b/pkgs/plt-services/meta/drdr/plt-build.rkt
index ad94165366..2c8cea4d84 100644
--- a/pkgs/plt-services/meta/drdr/plt-build.rkt
+++ b/pkgs/plt-services/meta/drdr/plt-build.rkt
@@ -216,7 +216,7 @@
                  (or (path-timeout pth)
                      (current-subprocess-timeout-seconds)))
                (define pth-cmd/general
-                 (path-command-line pth))
+                 (path-command-line pth pth-timeout))
                (define-values
                  (pth-cmd the-queue)
                  (match pth-cmd/general
diff --git a/pkgs/plt-services/meta/drdr/run-collect.rkt b/pkgs/plt-services/meta/drdr/run-collect.rkt
index 5517b72139..3d6d594385 100644
--- a/pkgs/plt-services/meta/drdr/run-collect.rkt
+++ b/pkgs/plt-services/meta/drdr/run-collect.rkt
@@ -68,7 +68,9 @@
          (define output-done? (zero? open-ports))
          (if (and output-done? process-done?)
              (if status
-                 (make-exit start-time end-time command-line (reverse log) status)
+                 (if (= status 2)
+                   (make-timeout start-time end-time command-line (reverse log))
+                   (make-exit start-time end-time command-line (reverse log) status))
                  (make-timeout start-time end-time command-line (reverse log)))
              (sync (if process-done?
                        never-evt