Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -137,25 +137,42 @@
 
 ;;======================================================================
 ;;  T R I G G E R S
 ;;======================================================================
 
-(define (mt:run-trigger cmd test-id test-rundir trigger logname test-name item-path event-time actual-state actual-status)
+(define (mt:run-trigger cmd test-id test-rundir trigger logname test-name item-path event-time actual-state actual-status target runname)
   ;; Putting the commandline into ( )'s means no control over the shell. 
   ;; stdout and stderr will be caught in the NBFAKE or mt_launch.log files
   ;; or equivalent. No need to do this. Just run it?
-  (let* ((fullcmd (conc "nbfake "
+  (let* ((new-trigger-format (configf:lookup *configdat* "setup" "new-trigger-format"))
+         (fullcmd 
+          (if (and new-trigger-format (string=? new-trigger-format "yes"))
+            (conc "nbfake "
+			cmd           " "
+			test-id       " "
+			test-rundir   " "
+			trigger       " "
+			actual-state  " "
+			actual-status " "
+			event-time    " "
+                        target        " "
+                        runname       " "
+			test-name     " "
+			item-path
+			)
+            (conc "nbfake "
 			cmd           " "
 			test-id       " "
 			test-rundir   " "
 			trigger       " "
 			test-name     " "
-			item-path     " " ;; has / prepended to deal with toplevel tests
+			item-path     " " 
 			actual-state  " "
 			actual-status " "
 			event-time
-			))
+			)
+          ))
 	 (prev-nbfake-log (get-environment-variable "NBFAKE_LOG")))
     (setenv "NBFAKE_LOG" (conc (cond
 				((and (directory-exists? test-rundir)
 				      (file-write-access? test-rundir))
 				 test-rundir)
@@ -163,18 +180,15 @@
 				      (file-write-access? *toppath*))
 				 *toppath*)
 				(else (conc "/tmp/" (current-user-name))))
 			       "/" logname))
     (debug:print-info 0 *default-log-port* "TRIGGERED on " trigger ", running command " fullcmd " output at " (get-environment-variable "NBFAKE_LOG"))
-    ;; (call-with-environment-variables
-    ;;  `(("NBFAKE_LOG" . ,(conc test-rundir "/" logname)))
-    ;;  (lambda ()
     (process-run fullcmd)
     (if prev-nbfake-log
 	(setenv "NBFAKE_LOG" prev-nbfake-log)
 	(unsetenv "NBFAKE_LOG"))
-    )) ;; ))
+    ))
 
 (define (mt:process-triggers dbstruct run-id test-id newstate newstatus)
   (if test-id 
       (let* ((test-dat      (db:get-test-info-by-id dbstruct run-id test-id)))
 	(if test-dat
@@ -184,11 +198,13 @@
 		   (duration      (db:test-get-run_duration test-dat))
 		   (comment       (db:test-get-comment      test-dat))
 		   (event-time    (db:test-get-event_time   test-dat))
 		   (tconfig       #f)
 		   (state         (if newstate  newstate  (db:test-get-state  test-dat)))
-		   (status        (if newstatus newstatus (db:test-get-status test-dat))))
+		   (status        (if newstatus newstatus (db:test-get-status test-dat)))
+                   (target        (getenv "MT_TARGET"))
+                   (runname       (getenv "MT_RUNNAME"))) 
 	      ;; (mutex-lock! *triggers-mutex*)
               (handle-exceptions
                exn
                (begin
                  (debug:print-error 0 *default-log-port* " Exception in mt:process-triggers for run-id="run-id" test-id="test-id" newstate="newstate" newstatus="newstatus
@@ -217,14 +233,14 @@
                       (for-each (lambda (trigger)
                                   (let* ((munged-trigger (string-translate trigger "/ " "--"))
 					(logname        (conc "last-trigger-" munged-trigger ".log")))
                                     ;; first any triggers from the testconfig
                                     (let ((cmd  (configf:lookup tconfig "triggers" trigger)))
-                                      (if cmd (mt:run-trigger cmd test-id test-rundir trigger (conc "tconfig-" logname) test-name item-path event-time state status)))
+                                      (if cmd (mt:run-trigger cmd test-id test-rundir trigger (conc "tconfig-" logname) test-name item-path event-time state status target runname)))
                                     ;; next any triggers from megatest.config
                                     (let ((cmd  (configf:lookup *configdat* "triggers" trigger)))
-                                      (if cmd (mt:run-trigger cmd test-id test-rundir trigger (conc "mtconfig-" logname) test-name item-path event-time state status)))))
+                                      (if cmd (mt:run-trigger cmd test-id test-rundir trigger (conc "mtconfig-" logname) test-name item-path event-time state status target runname)))))
                                 (list
                                  (conc state "/" status)
                                  (conc state "/")
                                  (conc "/" status)))
 		     (pop-directory))