Index: archive.scm
==================================================================
--- archive.scm
+++ archive.scm
@@ -231,14 +231,19 @@
 	      (archive-path            (if (vector? archive-block-info)
 					   (vector-ref archive-block-info 2) ;; look in db.scm for test-get-archive-block-info for the vector record info
 					   #f)) ;; no archive found?
 	      (archive-internal-path   (conc (common:get-testsuite-name) "-" run-id "/latest/" test-partial-path)))
 	 
-	 ;; some sanity checks 
+	 ;; some sanity checks, move an existing path out of the way
+	 ;;
 	 (if (and prev-test-physical-path
 		  (file-exists? prev-test-physical-path)) ;; what to do? abort or clean up or link it in?
-	     (debug:print 0 "ERROR: the old directory " prev-test-physical-path ", still exists! This should not be."))
+	     (let ((base (pathname-directory prev-test-physical-path))
+		   (dirn (pathname-file      prev-test-physical-path))
+		   (newn (conc base "/." dirn)))
+	       (debug:print 0 "ERROR: the old directory " prev-test-physical-path ", still exists! Moving it to " newn)
+	       (file-move prev-test-physical-path newn)))
 
 	 (if archive-path ;; no point in proceeding if there is no actual archive
 	     (begin
 	       ;; CREATE WORK AREA
 	       ;; test-src-path == #f     ==> don't copy in data from tests directory
@@ -259,9 +264,10 @@
 						 (debug:print 0 "ERROR: unable to get data for run-id=" run-id ", test-id=" test-id)
 						 (exit 1))))
 		      ;; new-test-path won't work - must use best-disk instead? Nope, new-test-path but tack on /..
 		      (bup-restore-params  (list "-d" archive-path "restore" "-C" (conc new-test-path "/..") archive-internal-path)))
 		 (debug:print-info 0 "Restoring archived data to " new-test-physical-path " from archive in " archive-path " ... " archive-internal-path)
-		 (run-n-wait bup-exe params: bup-restore-params print-cmd: #f)))
+		 (run-n-wait bup-exe params: bup-restore-params print-cmd: #f)
+		 (mt:test-set-state-status-by-id run-id test-id "COMPLETED" #f #f)))
 	     (debug:print 0 "ERROR: No archive path in the record for run-id=" run-id " test-id=" test-id))))
      (filter vector? tests))))
 	 

Index: dashboard-tests.scm
==================================================================
--- dashboard-tests.scm
+++ dashboard-tests.scm
@@ -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)

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -1,7 +1,7 @@
 ;; Always use two or four digit decimal
 ;; 1.01, 1.02...1.10,1.11,1,1101 ... 1.99,2.00..
 
 (declare (unit megatest-version))
 
-(define megatest-version 1.6018)
+(define megatest-version 1.6019)