@@ -47,14 +47,14 @@
 "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
   license GPL, Copyright (C) Matt Welland 2013
 
 Usage: dashboard [options]
-  -h                : this help
-  -server host:port : connect to host:port instead of db access
-  -test testid      : control test identified by testid
-  -guimonitor       : control panel for runs
+  -h                   : this help
+  -server host:port    : connect to host:port instead of db access
+  -test run-id,test-id : control test identified by testid
+  -guimonitor          : control panel for runs
 
 Misc
   -rows N         : set number of rows
 "))
 
@@ -1361,11 +1361,12 @@
 				       #:fontsize "10" 
 				       #:action (lambda (x)
 						  (let* ((toolpath (car (argv)))
 							 (buttndat (hash-table-ref *buttondat* button-key))
 							 (test-id  (db:test-get-id (vector-ref buttndat 3)))
-							 (cmd  (conc toolpath " -test " test-id "&")))
+							 (run-id   (db:test-get-run_id (vector-ref buttndat 3)))
+							 (cmd  (conc toolpath " -test " run-id "," test-id "&")))
 					;(print "Launching " cmd)
 						    (system cmd))))))
 	  (hash-table-set! *buttondat* button-key (vector 0 "100 100 100" button-key #f #f)) 
 	  (vector-set! testvec testnum butn)
 	  (loop runnum (+ testnum 1) testvec (cons butn res))))))
@@ -1495,17 +1496,20 @@
 		       (if *db* (db:close-all *db*))))
 	    (examine-run *db* runid)))
 	(begin
 	  (print "ERROR: runid is not a number " (args:get-arg "-run"))
 	  (exit 1)))))
- ((args:get-arg "-test")
-  (let ((testid (string->number (args:get-arg "-test"))))
-    (if (and (number? testid)
-	     (>= testid 0))
-	(examine-test testid)
+ ((args:get-arg "-test") ;; run-id,test-id
+  (let* ((dat     (map string->number (string-split (args:get-arg "-test") ",")))
+	 (run-id  (car dat))
+	 (test-id (cadr dat)))
+    (if (and (number? run-id)
+	     (number? test-id)
+	     (>= test-id 0))
+	(examine-test run-id test-id)
 	(begin
-	  (debug:print 3 "INFO: tried to open test with invalid test-id. " (args:get-arg "-test"))
+	  (debug:print 3 "INFO: tried to open test with invalid run-id,test-id. " (args:get-arg "-test"))
 	  (exit 1)))))
  ((args:get-arg "-guimonitor")
   (gui-monitor *db*))
  (else
   (set! uidat (make-dashboard-buttons *db* *num-runs* *num-tests* *dbkeys*))