Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -3858,16 +3858,17 @@
                                       (SELECT status FROM tests WHERE id=?) NOT IN ('WARN','FAIL')
                                     THEN 'PASS'
                                     ELSE status
                                     END WHERE id=?;") ;; DONE
 	'(test-set-log            "UPDATE tests SET final_logf=? WHERE id=?;")      ;; DONE
+        '(test-set-comment        "UPDATE tests SET comment=? WHERE id=?;")      ;; DONE
 	;; '(test-set-rundir-by-test-id "UPDATE tests SET rundir=? WHERE id=?")        ;; DONE
 	;; '(test-set-rundir         "UPDATE tests SET rundir=? AND testname=? AND item_path=?;") ;; DONE
 	'(test-set-rundir-shortdir "UPDATE tests SET rundir=?,shortdir=? WHERE testname=? AND item_path=? AND run_id=?;")    ;; BROKEN!!! NEEDS run-id
 	'(delete-tests-in-state   ;; "DELETE FROM tests WHERE state=?;")                  ;; DONE
 	  "UPDATE tests SET state='DELETED' WHERE state=?")
-	'(tests:test-set-toplog   "UPDATE tests SET final_logf=? WHERE run_id=? AND testname=? AND item_path='';")
+        '(tests:test-set-topcomment        "UPDATE tests SET comment=? WHERE id=?;")      ;; DONE        
 	'(update-cpuload-diskfree "UPDATE tests SET cpuload=?,diskfree=? WHERE id=?;") ;; DONE
 	'(update-uname-host       "UPDATE tests SET uname=?,host=? WHERE id=?;")       ;; DONE
         '(update-test-rundat      "INSERT INTO test_rundat (test_id,update_time,cpuload,diskfree,diskusage,run_duration) VALUES (?,?,?,?,?,?);")
 	'(update-test-state       "UPDATE tests SET state=? WHERE state=? AND run_id=? AND testname=? AND NOT (item_path='' AND testname IN (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));")
 	'(update-test-status      "UPDATE tests SET status=? WHERE status like ? AND run_id=? AND testname=? AND NOT (item_path='' AND testname IN (SELECT DISTINCT testname FROM tests WHERE testname=? AND item_path != ''));")

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -1910,10 +1910,11 @@
        (args:get-arg "-m"))
       ;; (if db (sqlite3:finalize! db))
       (set! *didsomething* #t)))
     
 (if (or (args:get-arg "-setlog")       ;; since setting up is so costly lets piggyback on -test-status
+        (and (args:get-arg "-m") (not (args:get-arg "-step")))
 	;;     (not (args:get-arg "-step")))  ;; -setlog may have been processed already in the "-step" previous
 	;;     NEW POLICY - -setlog sets test overall log on every call.
 	(args:get-arg "-set-toplog")
 	(args:get-arg "-test-status")
 	(args:get-arg "-set-values")
@@ -1920,11 +1921,11 @@
 	(args:get-arg "-load-test-data")
 	(args:get-arg "-runstep")
 	(args:get-arg "-summarize-items"))
     (if (not (getenv "MT_CMDINFO"))
 	(begin
-	  (debug:print-error 0 *default-log-port* "MT_CMDINFO env var not set, commands -test-status, -runstep and -setlog must be called *inside* a megatest environment!")
+	  (debug:print-error 0 *default-log-port* "MT_CMDINFO env var not set, commands -test-status, -runstep, -m  and -setlog must be called *inside* a megatest environment!")
 	  (exit 5))
 	(let* ((startingdir (current-directory))
 	       (cmdinfo   (common:read-encoded-string (getenv "MT_CMDINFO")))
 	       (transport (assoc/default 'transport cmdinfo))
 	       (testpath  (assoc/default 'testpath  cmdinfo))
@@ -1957,10 +1958,12 @@
 	      (let ((logfname (args:get-arg "-setlog")))
 		(rmt:test-set-log! run-id test-id logfname)))
 	  (if (args:get-arg "-set-toplog")
 	      ;; DO NOT run remote
 	      (tests:test-set-toplog! run-id test-name (args:get-arg "-set-toplog")))
+	  (if (args:get-arg "-m")
+              (rmt:test-set-comment! run-id test-id (args:get-arg "-m")))
 	  (if (args:get-arg "-summarize-items")
 	      ;; DO NOT run remote
 	      (tests:summarize-items run-id test-id test-name #t)) ;; do force here
 	  (if (args:get-arg "-runstep")
 	      (if (null? remargs)

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -641,10 +641,14 @@
 (define (rmt:get-testinfo-state-status run-id test-id)
   (rmt:send-receive 'get-testinfo-state-status run-id (list run-id test-id)))
 
 (define (rmt:test-set-log! run-id test-id logf)
   (if (string? logf)(rmt:general-call 'test-set-log run-id logf test-id)))
+
+(define (rmt:test-set-comment! run-id test-id comment)
+  (if (string? comment)(rmt:general-call 'test-set-comment run-id comment test-id)))
+
 
 (define (rmt:test-set-top-process-pid run-id test-id pid)
   (rmt:send-receive 'test-set-top-process-pid run-id (list run-id test-id pid)))
 
 (define (rmt:test-get-top-process-pid run-id test-id)