@@ -557,11 +557,11 @@
 				   " -state RUNNING"))))
 	       (run-test  (lambda (x)
 			    (iup:attribute-set! 
 			     command-text-box "VALUE"
 			     (conc "megatest -target " keystring " -runname " runname 
-				   " -runtests " (conc testname "/" (if (equal? item-path "")
+				   " -run -testpatt " (conc testname "/" (if (equal? item-path "")
 									"%" 
 									item-path))
 				   ))))
 	       (remove-test (lambda (x)
 			      (iup:attribute-set!
@@ -589,12 +589,19 @@
 			       command-text-box "VALUE"
 			       (conc "megatest -remove-runs -target " keystring " -runname " runname
 				     " -testpatt " (conc testname "/" (if (equal? item-path "")
 									  "%"
 									  item-path))
-				     " -v"))
-			      )))
+				     " -v"))))
+	       (archive-test  (lambda (x)
+				(iup:attribute-set! 
+				 command-text-box "VALUE"
+				 (conc "megatest -target " keystring " -runname " runname 
+				       " -archive save-remove -testpatt " (conc testname "/" (if (equal? item-path "")
+												 "%" 
+												 item-path))
+				       )))))
 	  (cond
 	   ((not testdat)(begin (print "ERROR: bad test info for " test-id)(exit 1)))
 	   ((not rundat)(begin (print "ERROR: found test info but there is a problem with the run info for " run-id)(exit 1)))
 	   (else
 	    ;;  (test-set-status! db run-id test-name state status itemdat)
@@ -610,16 +617,17 @@
 			       (host-info-panel testdat store-label)
 			       ;; The controls
 			       (iup:frame #:title "Actions" 
 					  (iup:vbox
 					   (iup:hbox 
-					    (iup:button "View Log"      #:action viewlog     #:size "80x")
-					    (iup:button "Start Xterm"   #:action xterm       #:size "80x")
-					    (iup:button "Run Test"      #:action run-test    #:size "80x")
-					    (iup:button "Clean Test"    #:action remove-test #:size "80x")
+					    (iup:button "View Log"      #:action viewlog      #:size "80x")
+					    (iup:button "Start Xterm"   #:action xterm        #:size "80x")
+					    (iup:button "Run Test"      #:action run-test     #:size "80x")
+					    (iup:button "Clean Test"    #:action remove-test  #:size "80x")
 					    (iup:button "CleanRunExecute!"    #:action clean-run-execute #:size "80x")
-					    (iup:button "Kill All Jobs" #:action kill-jobs   #:size "80x")
+					    (iup:button "Kill All Jobs" #:action kill-jobs    #:size "80x")
+					    (iup:button "Archive Test"  #:action archive-test #:size "80x")
 					    (iup:button "Close"         #:action (lambda (x)(exit)) #:size "80x"))
 					   (apply 
 					    iup:hbox
 					    (list command-text-box command-launch-button))))
 			       (set-fields-panel dbstruct run-id test-id testdat)