Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -53,11 +53,12 @@
 # 
 # $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm
 #	csc utils/revtagfsl.scm -o $(PREFIX)/bin/revtagfsl
 
 # Special dependencies for the includes
-tests.o db.o launch.o runs.o dashboard-tests.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o megatest.o : db_records.scm
+tests.o db.o launch.o runs.o dashboard-tests.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o  \
+  archive.o megatest.o : db_records.scm
 tests.o runs.o dashboard.o dashboard-tests.o dashboard-main.o  : run_records.scm
 db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm
 tests.o tasks.o dashboard-tasks.o : task_records.scm
 runs.o : test_records.scm
 megatest.o : megatest-fossil-hash.scm

Index: api.scm
==================================================================
--- api.scm
+++ api.scm
@@ -173,10 +173,13 @@
 
 	    ;; KEYS
 	    ((get-key-val-pairs)               (apply db:get-key-val-pairs dbstruct params))
 	    ((get-keys)                        (db:get-keys dbstruct))
 
+	    ;; ARCHIVES
+	    ((test-get-archive-block-info)     (apply db:test-get-archive-block-info dbstruct params))
+	    
 	    ;; TESTS
 	    ((test-toplevel-num-items)         (apply db:test-toplevel-num-items dbstruct params))
 	    ((get-test-info-by-id)	       (apply db:get-test-info-by-id dbstruct params))
 	    ((test-get-rundir-from-test-id)    (apply db:test-get-rundir-from-test-id dbstruct params))
 	    ((get-count-tests-running)         (apply db:get-count-tests-running dbstruct params))

Index: archive.scm
==================================================================
--- archive.scm
+++ archive.scm
@@ -199,91 +199,69 @@
     #t))
 
 (define (archive:bup-restore archive-command run-id run-name tests)  ;; move the getting of archive space down into the below block so that a single run can 
   ;; allocate as needed should a disk fill up
   ;;
-  (let* ((disk-groups  (make-hash-table))
-	 (test-groups  (make-hash-table)) ;; these two (disk and test groups) could be combined nicely
-	 (bup-exe      (or (configf:lookup *configdat* "archive" "bup") "bup"))
+  (let* ((bup-exe      (or (configf:lookup *configdat* "archive" "bup") "bup"))
 	 (linktree     (configf:lookup *configdat* "setup" "linktree")))
 
     ;; from the test info bin the path to the test by stem
     ;;
     (for-each
      (lambda (test-dat)
-       (let* ((item-path         (db:test-get-item-path test-dat))
+       ;; When restoring test-dat will initially contain an old and invalid path to the test
+       (let* ((best-disk         (get-best-disk *configdat*))
+	      (item-path         (db:test-get-item-path test-dat))
 	      (test-name         (db:test-get-testname  test-dat))
 	      (test-id           (db:test-get-id        test-dat))
 	      (run-id            (db:test-get-run_id    test-dat))
-	      (target            (string-intersperse (map cadr (rmt:get-key-val-pairs run-id)) "/"))
+	      (keyvals           (rmt:get-key-val-pairs run-id))
+	      (target            (string-intersperse (map cadr keyvals) "/"))
 	      
 	      (toplevel/children (and (db:test-get-is-toplevel test-dat)
 				      (> (rmt:test-toplevel-num-items run-id test-name) 0)))
 	      (test-partial-path (conc target "/" run-name "/" (runs:make-full-test-name test-name item-path)))
 	      ;; note the trailing slash to get the dir inspite of it being a link
 	      (test-path         (conc linktree "/" test-partial-path))
-	      (test-physical-path (if (file-exists? test-path) (read-symbolic-link test-path #t) #f))
-	      (partial-path-index (if test-physical-path (substring-index test-partial-path test-physical-path) #f))
-	      (test-base         (if (and partial-path-index 
-					  test-physical-path )
-				     (substring test-physical-path
-						0
-						partial-path-index)
-				     #f)))
-	 
-	 ;; CREATE WORK AREA
-	 (create-work-area run-id run-info keyvals test-id test-src-path disk-path testname itemdat #!key (remtries 2))
-	 
-	 ;; DO BUP RESTORE
-
-
-
- 	 (if (or toplevel/children
-		 (not (file-exists? test-path)))
-	     #f
-	     (begin
-	       (debug:print 0
-			    "From test-dat=" test-dat " derived the following:\n"
-			    "test-partial-path  = " test-partial-path "\n"
-			    "test-path          = " test-path "\n"
-			    "test-physical-path = " test-physical-path "\n"
-			    "partial-path-index = " partial-path-index "\n"
-			    "test-base          = " test-base)
-	       (hash-table-set! disk-groups test-base (cons test-physical-path (hash-table-ref/default disk-groups test-base '())))
-	       (hash-table-set! test-groups test-base (cons test-dat (hash-table-ref/default test-groups test-base '())))
-	       test-path))))
-     tests)
-    ;; for each disk-group
-    (for-each 
-     (lambda (disk-group)
-       (debug:print 0 "Processing disk-group " disk-group)
-       (let* ((test-paths (hash-table-ref disk-groups disk-group))
-	      ;; ((string-intersperse (map cadr (rmt:get-key-val-pairs 1)) "-")
-	      (bup-init-params  (list "-d" archive-dir "init"))
-	      (bup-index-params (append (list "-d" archive-dir "index") test-paths))
-	      (bup-save-params  (append (list "-d" archive-dir "save" ;; (conc "--strip-path=" linktree)
-					      (conc "-" compress) ;; or (conc "--compress=" compress)
-					      "-n" (conc (common:get-testsuite-name) "-" run-id)
-					      (conc "--strip-path=" disk-group))
-					test-paths))
-	      (print-prefix      #f)) ;; "Running: ")) ;; change to #f to turn off printing
-	 (if (not (file-exists? archive-dir))
-	     (create-directory archive-dir #t))
-	 (if (not (file-exists? (conc archive-dir "/HEAD")))
-	     (begin
-	       ;; replace this with jobrunner stuff enventually
-	       (debug:print-info 0 "Init bup in " archive-dir)
-	       (run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix)))
-	 (debug:print-info 0 "Indexing data to be archived")
-	 (run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix)
-	 (debug:print-info 0 "Archiving data with bup")
-	 (run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix)
-	 (for-each
-	  (lambda (test-dat)
-	    (let ((test-id           (db:test-get-id        test-dat))
-		  (run-id            (db:test-get-run_id    test-dat)))
-	      (rmt:test-set-archive-block-id run-id test-id archive-id)
-	      (if (member archive-command '("save-remove"))
-		  (runs:remove-test-directory test-dat 'archive-remove))))
-	  (hash-table-ref test-groups disk-group))))
-     (hash-table-keys disk-groups))
-    #t))
+	      ;; if the old path was not deleted then prev-test-physical-path will end up pointing to a real directory
+	      (prev-test-physical-path (if (file-exists? test-path) (read-symbolic-link test-path #t) #f))
+
+	      (new-test-physical-path  (conc best-disk "/" test-partial-path))
+	      (archive-block-id        (db:test-get-archived test-dat))
+	      (archive-block-info      (rmt:test-get-archive-block-info archive-block-id))
+	      (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 
+	 (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."))
+
+	 (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
+	       ;; itemdat       == string ==> use directly
+	       (create-work-area run-id run-name keyvals test-id #f best-disk test-name item-path) ;; #!key (remtries 2))
+
+	       ;; 1. Get the block id from the test info
+	       ;; 2. Get the block data given the block id
+	       ;; 3. Construct the paths etc. for the following command:
+	       ;; 
+	       ;; bup -d /tmp/matt/adisk1/2015_q1/fullrun_e1a40/ restore -C /tmp/seeme fullrun-30/latest/ubuntu/nfs/none/w02.1.20.54_b/
+
+	       ;; DO BUP RESTORE
+	       (let* ((new-test-dat        (rmt:get-test-info-by-id run-id test-id))
+		      (new-test-path       (if (vector? new-test-dat )
+					       (db:test-get-rundir new-test-dat)
+					       (begin
+						 (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)))
+	     (debug:print 0 "ERROR: No archive path in the record for run-id=" run-id " test-id=" test-id))))
+     (filter vector? tests))))
+	 

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -1040,10 +1040,27 @@
    #f
    (lambda (db)
      (sqlite3:execute db "UPDATE tests SET archived=? WHERE id=?;"
 		      archive-block-id test-id))))
  
+;; Look up the archive block info given a block-id
+;;
+(define (db:test-get-archive-block-info dbstruct archive-block-id)
+  (db:with-db
+   dbstruct
+   #f
+   #f
+   (lambda (db)
+     (let ((res #f))
+       (sqlite3:for-each-row 
+	;;        0         1           2        3          4           5
+	(lambda (id archive-disk-id disk-path last-du last-du-time creation-time)
+	  (set! res (vector id archive-disk-id disk-path last-du last-du-time creation-time)))
+	db
+	"SELECT id,archive_disk_id,disk_path,last_du,last_du_time,creation_time FROM archive_blocks WHERE id=?;"
+	archive-block-id)
+       res))))
 
 ;; (define (db:archive-allocate-testsuite/area-to-block block-id testsuite-name areakey)
 ;;   (let* ((dbdat        (db:get-db dbstruct #f)) ;; archive tables are in main.db
 ;; 	 (db           (db:dbdat-get-db dbdat))
 ;; 	 (res          '())
@@ -2276,11 +2293,11 @@
       #f
       test-id))))
 
 (define db:test-record-fields '("id"           "run_id"        "testname"  "state"      "status"      "event_time"
 				"host"         "cpuload"       "diskfree"  "uname"      "rundir"      "item_path"
-                                "run_duration" "final_logf"    "comment"   "shortdir"   "attemptnum"))
+                                "run_duration" "final_logf"    "comment"   "shortdir"   "attemptnum"  "archived"))
 
 ;; fields *must* be a non-empty list
 ;;
 (define (db:field->number fieldname fields)
   (if (null? fields)
@@ -2305,13 +2322,13 @@
 		    dbstruct)) ;; still settling on when to use dbstruct or dbdat
 	 (db    (db:dbdat-get-db dbdat))
 	 (res '()))
     (db:delay-if-busy dbdat)
     (sqlite3:for-each-row
-     (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment shortdir attemptnum)
-       ;;                 0    1       2      3      4        5       6      7        8     9     10      11          12          13       14     15
-       (set! res (cons (vector id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment shortdir attemptnum)
+     (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment shortdir attemptnum archived)
+       ;;                 0    1       2      3      4        5       6      7        8     9     10      11          12          13       14     15        16
+       (set! res (cons (vector id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment shortdir attemptnum archived)
 		       res)))
      db
      (conc "SELECT " db:test-record-qry-selector " FROM tests WHERE state != 'DELETED' AND run_id=?;")
      run-id)
     res))
@@ -2382,13 +2399,13 @@
    run-id
    #f
    (lambda (db)
      (let ((res #f))
        (sqlite3:for-each-row ;; attemptnum added to hold pid of top process (not Megatest) controlling a test
-	(lambda (id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum)
+	(lambda (id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived)
 	  ;;             0    1       2      3      4        5       6      7        8     9     10      11          12          13           14         15          16
-	  (set! res (vector id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum)))
+	  (set! res (vector id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived)))
 	db
 	(conc "SELECT " db:test-record-qry-selector " FROM tests WHERE id=?;")
 	test-id)
        res))))
 

Index: db_records.scm
==================================================================
--- db_records.scm
+++ db_records.scm
@@ -82,10 +82,12 @@
 (define-inline (db:test-get-item-path    vec) (vector-ref vec 11))
 (define-inline (db:test-get-run_duration vec) (vector-ref vec 12))
 (define-inline (db:test-get-final_logf   vec) (vector-ref vec 13))
 (define-inline (db:test-get-comment      vec) (vector-ref vec 14))
 (define-inline (db:test-get-process_id   vec) (vector-ref vec 16))
+(define-inline (db:test-get-archived     vec) (vector-ref vec 17))
+
 ;; (define-inline (db:test-get-pass_count   vec) (vector-ref vec 15))
 ;; (define-inline (db:test-get-fail_count   vec) (vector-ref vec 16))
 (define-inline (db:test-get-fullname     vec)
   (conc (db:test-get-testname vec) "/" (db:test-get-item-path vec)))
 

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -566,14 +566,16 @@
 ;; All log file links should be stored relative to the top of link path
 ;;  
 ;; <target> - <testname> [ - <itempath> ] 
 ;;
 (define (create-work-area run-id run-info keyvals test-id test-src-path disk-path testname itemdat #!key (remtries 2))
-  (let* ((item-path (item-list->path itemdat))
-	 (runname  (db:get-value-by-header (db:get-rows run-info)
-					   (db:get-header run-info)
-					   "runname"))
+  (let* ((item-path (if (string? itemdat) itemdat (item-list->path itemdat))) ;; if pass in string - just use it
+	 (runname   (if (string? run-info) ;; if we pass in a string as run-info use it as run-name.
+			run-info
+			(db:get-value-by-header (db:get-rows run-info)
+						(db:get-header run-info)
+						"runname")))
 	 ;; convert back to db: from rdb: - this is always run at server end
 	 (target   (string-intersperse (map cadr keyvals) "/"))
 
 	 (not-iterated  (equal? "" item-path))
 
@@ -706,11 +708,11 @@
 	   (if (not (file-exists? lnktarget)) (create-symbolic-link test-path lnktarget)))))
 
     (if (not (directory? test-path))
 	(create-directory test-path #t)) ;; this is a hack, I don't know why out of the blue this path does not exist sometimes
 
-    (if (directory? test-path)
+    (if (and test-src-path (directory? test-path))
 	(begin
 	  (let* ((ovrcmd (let ((cmd (config-lookup *configdat* "setup" "testcopycmd")))
 			   (if cmd
 			       ;; substitute the TEST_SRC_PATH and TEST_TARG_PATH
 			       (string-substitute "TEST_TARG_PATH" test-path
@@ -722,11 +724,11 @@
 				   " >> " test-path "/mt_launch.log 2>> " test-path "/mt_launch.log")))
 		 (status (system cmd)))
 	    (if (not (eq? status 0))
 		(debug:print 2 "ERROR: problem with running \"" cmd "\"")))
 	  (list lnkpathf lnkpath ))
-	(if (> remtries 0)
+	(if (and test-src-path (> remtries 0))
 	    (begin
 	      (debug:print 0 "ERROR: Failed to create work area at " test-path " with link at " lnktarget ", remaining attempts " remtries)
 	      ;; 
 	      (create-work-area run-id run-info keyvals test-id test-src-path disk-path testname itemdat remtries: (- remtries 1)))
 	    (list #f #f)))))

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -674,5 +674,8 @@
 (define (rmt:archive-register-disk bdisk-name bdisk-path df)
   (rmt:send-receive 'archive-register-disk #f (list bdisk-name bdisk-path df)))
 
 (define (rmt:test-set-archive-block-id run-id test-id archive-block-id)
   (rmt:send-receive 'test-set-archive-block-id run-id (list run-id test-id archive-block-id)))
+
+(define (rmt:test-get-archive-block-info archive-block-id)
+  (rmt:send-receive 'test-get-archive-block-info #f (list archive-block-id)))

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -1471,11 +1471,11 @@
 		    (debug:print 1 "Printing info for run " runkey ", run=" run ", tests=" tests ", header=" header)
 		    action)
 		   ((run-wait)
 		    (debug:print 1 "Waiting for run " runkey ", run=" runnamepatt " to complete"))
 		   ((archive)
-		    (debug:print 1 "Archiving data for run: " runkey " " (db:get-value-by-header run header "runname"))
+		    (debug:print 1 "Archiving/restoring (" (args:get-arg "-archive") ") data for run: " runkey " " (db:get-value-by-header run header "runname"))
 		    (set! worker-thread (make-thread (lambda ()
 						       (case (string->symbol (args:get-arg "-archive"))
 							 ((save save-remove keep-html)(archive:run-bup (args:get-arg "-archive") run-id run-name tests))
 							 ((restore)(archive:bup-restore (args:get-arg "-archive") run-id run-name tests))
 							 (else (debug:print 0 "ERROR: unrecognised sub command to -archive. Run \"megatest\" to see help"))))
@@ -1484,17 +1484,19 @@
 		   (else
 		    (debug:print-info 0 "action not recognised " action)))
 		 
 		 ;; actions that operate on one test at a time can be handled below
 		 ;;
-		 (let ((sorted-tests     (sort tests (lambda (a b)(let ((dira ;; (rmt:sdb-qry 'getstr 
-									 (db:test-get-rundir a)) ;; )  ;; (filedb:get-path *fdb* (db:test-get-rundir a)))
-									(dirb ;; (rmt:sdb-qry 'getstr 
-									 (db:test-get-rundir b))) ;; ) ;; ((filedb:get-path *fdb* (db:test-get-rundir b))))
-								    (if (and (string? dira)(string? dirb))
-									(> (string-length dira)(string-length dirb))
-									#f)))))
+		 (let ((sorted-tests     (filter 
+					  vector?
+					  (sort tests (lambda (a b)(let ((dira ;; (rmt:sdb-qry 'getstr 
+									  (db:test-get-rundir a)) ;; )  ;; (filedb:get-path *fdb* (db:test-get-rundir a)))
+									 (dirb ;; (rmt:sdb-qry 'getstr 
+									  (db:test-get-rundir b))) ;; ) ;; ((filedb:get-path *fdb* (db:test-get-rundir b))))
+								     (if (and (string? dira)(string? dirb))
+									 (> (string-length dira)(string-length dirb))
+									 #f))))))
 		       (toplevel-retries (make-hash-table)) ;; try three times to loop through and remove top level tests
 		       (test-retry-time  (make-hash-table))
 		       (allow-run-time   10)) ;; seconds to allow for killing tests before just brutally killing 'em
 		   (let loop ((test (car sorted-tests))
 			      (tal  (cdr sorted-tests)))
@@ -1566,13 +1568,14 @@
 				  (if (null? new-tests)
 				      (debug:print-info 1 "Run completed according to zero tests matching provided criteria.")
 				      (loop (car new-tests)(cdr new-tests)))))
 			       ((archive)
 				(if (not toplevel-with-children)
-				    (begin
-				      (debug:print-info 0 "Estimating disk space usage for " test-fulln)
-				      (debug:print-info 0 "   " (common:get-disk-space-used (conc run-dir "/")))))
+				    (case (string->symbol (args:get-arg "-archive"))
+				      ((save save-remove keep-html)
+				       (debug:print-info 0 "Estimating disk space usage for " test-fulln)
+				       (debug:print-info 0 "   " (common:get-disk-space-used (conc run-dir "/"))))))
 				(if (not (null? tal))
 				    (loop (car tal)(cdr tal))))
 			       )))
 		       )
 		     (if worker-thread (thread-join! worker-thread))))))

DELETED tests/fullrun/config/mt_include_1.config
Index: tests/fullrun/config/mt_include_1.config
==================================================================
--- tests/fullrun/config/mt_include_1.config
+++ /dev/null
@@ -1,29 +0,0 @@
-[setup]
-# exectutable /path/to/megatest
-max_concurrent_jobs 50
-
-linktree #{getenv MT_RUN_AREA_HOME}/tmp/mt_links
-
-[jobtools]
-useshell yes
-# ## launcher launches jobs, the job is managed on the target host
-## by megatest, comment out launcher to run local
-# workhosts localhost hermes
-# launcher exec nbfake
-# launcher nbfake
-# launcher loadrunner
-# launcher echo
-# launcher nbfind
-# launcher nodanggood
-# launcher loadrunner
-launcher nbfake
-# maxload *per cpu*
-maxload 1.5
-# default waitdelay is 60 seconds
-waitdelay 15
-
-
-## use "xterm -e csi -- " as a launcher to examine the launch environment.
-## exit with (exit)
-## get a shell with (system "bash")
-# launcher xterm -e csi --

DELETED tests/fullrun/config/mt_include_2.config
Index: tests/fullrun/config/mt_include_2.config
==================================================================
--- tests/fullrun/config/mt_include_2.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[disks]
-disk0 #{getenv MT_RUN_AREA_HOME}/tmp/mt_runs

ADDED   tests/fullrun/configs/mt_include_1.config
Index: tests/fullrun/configs/mt_include_1.config
==================================================================
--- /dev/null
+++ tests/fullrun/configs/mt_include_1.config
@@ -0,0 +1,23 @@
+[setup]
+# exectutable /path/to/megatest
+max_concurrent_jobs 250
+
+linktree #{getenv MT_RUN_AREA_HOME}/tmp/mt_links
+
+[jobtools]
+useshell yes
+# ## launcher launches jobs, the job is managed on the target host
+## by megatest, comment out launcher to run local
+# workhosts localhost hermes
+# launcher exec nbfake
+
+launcher nbfake
+# launcher echo
+
+# launcher nbfind
+# launcher nodanggood
+
+## use "xterm -e csi -- " as a launcher to examine the launch environment.
+## exit with (exit)
+## get a shell with (system "bash")
+# launcher xterm -e csi --

ADDED   tests/fullrun/configs/mt_include_2.config
Index: tests/fullrun/configs/mt_include_2.config
==================================================================
--- /dev/null
+++ tests/fullrun/configs/mt_include_2.config
@@ -0,0 +1,2 @@
+[disks]
+disk0 #{getenv MT_RUN_AREA_HOME}/tmp/mt_runs

Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ tests/fullrun/megatest.config
@@ -6,11 +6,11 @@
 # refareas can be searched to find previous runs
 # the path points to where megatest.db exists
 [refareas]
 area1 /tmp/oldarea/megatest
 
-[include config/mt_include_1.config]
+[include ./configs/mt_include_1.config]
 
 [dashboard]
 pre-command  xterm -geometry 180x20 -e "
 post-command |& tee results.log ;echo Press any key to continue;bash -c 'read -n 1 -s'" &
 testsort -event_time
@@ -98,11 +98,11 @@
 
 # MT_XTERM_CMD overrides the terminal command
 # MT_XTERM_CMD xterm -bg lightgreen -fg black
 
 SPECIAL_ENV_VARS overide them here - should be seen at launch and in the runs
-TESTVAR [system echo $PWD]
+TESTVAR [system readlink -f .]
 DEADVAR [system ls]
 VARWITHDOLLAR $HOME/.zshrc
 WACKYVAR  #{system ls > /dev/null}
 WACKYVAR2 #{get validvalues state}
 WACKYVAR3 #{getenv USER}
@@ -156,11 +156,12 @@
 ## -or-
 ## name /path/to/area
 [disks]
 disk0 /foobarbazz
 disk1 not-a-disk
-[include config/mt_include_2.config]
+
+[include ./configs/mt_include_2.config]
 
 [include #{getenv USER}_testing.config]
 
 [jobgroups]
 

Index: tests/fullrun/runconfigs.config
==================================================================
--- tests/fullrun/runconfigs.config
+++ tests/fullrun/runconfigs.config
@@ -4,12 +4,12 @@
 # target based getting of config file, look at afs.config and nfs.config
 [include #{getenv fsname}.config]
 
 [include #{getenv MT_RUN_AREA_HOME}/common_runconfigs.config]
 
-# #{system echo 'VACKYVAR #{shell pwd}' > $MT_RUN_AREA_HOME/config/$USER.config}
-[include ./config/#{getenv USER}.config]
+# #{system echo 'VACKYVAR #{shell pwd}' > $MT_RUN_AREA_HOME/configs/$USER.config}
+[include ./configs/#{getenv USER}.config]
 
 
 WACKYVAR0 #{get ubuntu/nfs/none CURRENT}
 WACKYVAR1 #{scheme (args:get-arg "-target")}
 

Index: utils/installall.sh
==================================================================
--- utils/installall.sh
+++ utils/installall.sh
@@ -12,10 +12,11 @@
 #  PURPOSE.
 
 echo You may need to do the following first:
 echo sudo apt-get install libreadline-dev
 echo sudo apt-get install libwebkitgtk-dev 
+echo sudo apt-get install libssl-dev
 echo sudo apt-get install libmotif3 -OR- set KTYPE=26g4
 echo KTYPE can be 26, 26g4, or 32
 echo  
 echo KTYPE=$KTYPE
 echo You are using PREFIX=$PREFIX
@@ -99,11 +100,12 @@
     cd $BUILDHOME
 fi
 
 # Some eggs are quoted since they are reserved to Bash
 # for f in matchable readline apropos base64 regex-literals format "regex-case" "test" coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp rpc csv-xml fmt json md5; do
-$CHICKEN_INSTALL $PROX -keep-installed matchable readline apropos base64 regex-literals format "regex-case" "test" coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp rpc csv-xml fmt json md5 awful http-client spiffy uri-common intarweb http-client spiffy-request-vars spiffy-directory-listing ssax sxml-serializer sxml-modifications logpro
+# $CHICKEN_INSTALL $PROX -keep-installed matchable readline apropos base64 regex-literals format "regex-case" "test" coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp rpc csv-xml fmt json md5 awful http-client spiffy uri-common intarweb http-client spiffy-request-vars md5 message-digest http-client spiffy-directory-listing
+$CHICKEN_INSTALL $PROX -keep-installed matchable readline apropos base64 regex-literals format "regex-case" "test" coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp rpc csv-xml fmt json md5 awful http-client spiffy uri-common intarweb http-client spiffy-request-vars s md5 message-digest piffy-directory-listing ssax sxml-serializer sxml-modifications logpro
 #   if ! [[ -e $PREFIX/lib/chicken/6/$f.so ]];then
 #     $CHICKEN_INSTALL $PROX $f
 #     # $CHICKEN_INSTALL -deploy -prefix $DEPLOYTARG $PROX $f
 #   else
 #     echo Skipping install of egg $f as it is already installed