@@ -14,11 +14,11 @@
 (require-library iup)
 (import (prefix iup iup:))
 
 (use canvas-draw)
 (import canvas-draw-iup)
-
+(use ducttape-lib)
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors) ;; defstruct
 (import (prefix sqlite3 sqlite3:))
 
 (declare (uses common))
 (declare (uses margs))
@@ -325,10 +325,22 @@
                           (lambda (alist-entry)
                             (member (car alist-entry)
                                     '(allruns-by-id allruns))) ;; FIELDS OF INTEREST
                           (dboard:tabdat->alist tabdat-item)))))
 
+
+(define (dboard:launch-testpanel run-id test-id)
+  (let* ((cfg-sh  (conc *common:this-exe-dir* "/cfg.sh"))
+         (cmd (conc
+               (if (common:file-exists? cfg-sh)
+                   (conc "source "cfg-sh" && ")
+                   "")
+               *common:this-exe-fullpath*
+               " -test " run-id "," test-id
+               " &")))
+    (system cmd)))
+
 (define (dboard:tabdat-target-string vec)
   (let ((targ (dboard:tabdat-target vec)))
     (if (list? targ)(string-intersperse targ "/") "no-target-specified")))
 
 (define (dboard:tabdat-test-patts-use vec)    
@@ -2134,15 +2146,15 @@
                                   (item-path (db:test-get-item-path (rmt:get-test-info-by-id run-id test-id)))
                                   (item-test-path (conc test-name "/" (if (equal? item-path "")
 									"%" 
 									item-path)))
                                   (status-chars (char-set->list (string->char-set status)))
-                                  (testpanel-cmd      (conc toolpath " -test " (dboard:tabdat-curr-run-id tabdat) "," test-id " &")))
+                                  (run-id       (dboard:tabdat-curr-run-id tabdat)))
                              (debug:print-info 13 *default-log-port* "status-chars=["status-chars"] status=["status"]")
                              (cond
                               ((member #\1 status-chars) ;; 1 is left mouse button
-                               (system testpanel-cmd))
+                               (dboard:launch-testpanel run-id test-id))
                               
                               ((member #\2 status-chars) ;; 2 is middle mouse button
                                
                                (debug:print-info 13 *default-log-port* "mmb- test-name="test-name" testpatt="testpatt)
                                (iup:show (dashboard:popup-menu run-id test-id target runname test-name testpatt item-test-path test-info) ;; popup-menu
@@ -2394,15 +2406,11 @@
   (iup:menu 
    (iup:menu-item
     "Test Control Panel"
     #:action
     (lambda (obj)
-      (let* ((toolpath (car (argv)))
-             (testpanel-cmd
-              (conc toolpath " -test " run-id "," test-id " &")))
-        (system testpanel-cmd)
-        )))
+      (launch-testpanel run-id test-id)))
    
    (iup:menu-item
     (conc "View Log " item-test-path)
     #:action
     (lambda (obj)
@@ -2728,14 +2736,12 @@
 					 ))
 				   (if (eq? pressed 0)
 				       (let* ((toolpath (car (argv)))
 					      (buttndat (hash-table-ref (dboard:tabdat-buttondat runs-dat) button-key))
 					      (test-id  (db:test-get-id (vector-ref buttndat 3)))
-					      (run-id   (db:test-get-run_id (vector-ref buttndat 3)))
-					      (cmd  (conc toolpath " -test " run-id "," test-id "&")))
-					 (system cmd)))
-				   )))))
+					      (run-id   (db:test-get-run_id (vector-ref buttndat 3))))
+                                         (dboard:launch-testpanel run-id test-id))))))))
 	  (hash-table-set! (dboard:tabdat-buttondat runs-dat) button-key (vector 0 "100 100 100" button-key #f #f)) 
 	  (vector-set! testvec testnum butn)
 	  (loop runnum (+ testnum 1) testvec (cons butn res))))))
     ;; now assemble the hdrlst and bdylst and kick off the dialog
     (iup:show