Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -27,11 +27,11 @@
 # BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE")
 # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr)
 ARCHSTR=$(shell lsb_release -sr)
 # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
 
-all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard newdboard txtdb
+all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard txtdb
 
 refdb : txtdb/txtdb.scm
 	csc -I txtdb txtdb/txtdb.scm -o refdb
 
 mtest: $(OFILES) megatest.o

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -234,10 +234,35 @@
 ;; '(print (string-intersperse (map cadr (hash-table-ref/default (read-config "megatest.config" \#f \#t) "disks" '"'"'("none" ""))) "\n"))'
 (define (common:get-disks)
   (hash-table-ref/default 
    (read-config "megatest.config" #f #t)
    "disks" '("none" "")))
+
+;;======================================================================
+;; T A R G E T S
+;;======================================================================
+
+(define (common:args-get-target #!key (split #f))
+  (let* ((target  (if (args:get-arg "-reqtarg")
+		      (args:get-arg "-reqtarg")
+		      (if (args:get-arg "-target")
+			  (args:get-arg "-target")
+			  #f)))
+	 (tlist   (if target (string-split target "/" #t) '()))
+	 (valid   (if target
+		      (and (not (null? tlist))
+			   (null? (filter string-null? tlist)))
+		      #f)))
+    (if valid
+	(if split
+	    tlist
+	    target)
+	(if target
+	    (begin
+	      (debug:print 0 "ERROR: Invalid target, spaces or blanks not allowed \"" target "\"")
+	      #f)
+	    #f))))
 
 ;;======================================================================
 ;; M I S C   L I S T S
 ;;======================================================================
 
@@ -360,28 +385,32 @@
 	 (uname #f))
     (if (null? (car uname-res))
 	"unknown"
 	(caar uname-res))))
 	      
-(define (save-environment-as-files fname #!key (ignorevars (list "DISPLAY" "LS_COLORS" "XKEYSYMDB" "EDITOR")))
+(define (save-environment-as-files fname #!key (ignorevars (list "USER" "HOME" "DISPLAY" "LS_COLORS" "XKEYSYMDB" "EDITOR")))
   (let ((envvars (get-environment-variables))
         (whitesp (regexp "[^a-zA-Z0-9_\\-:;,.\\/%$]")))
      (with-output-to-file (conc fname ".csh")
        (lambda ()
           (for-each (lambda (key)
-		      (if (not (member key ignorevars))
-			  (let* ((val (cdr key))
-				 (sval (if (string-search whitesp val)(conc "\"" val "\"") val)))
-			    (print "setenv " (car key) " " sval))))
+		      (let* ((val (cdr key))
+			     (sval (if (string-search whitesp val)(conc "\"" val "\"") val)))
+			(print (if (member key ignorevars)
+				   "# setenv "
+				   "setenv ")
+			       (car key) " " sval)))
 		      envvars)))
      (with-output-to-file (conc fname ".sh")
        (lambda ()
           (for-each (lambda (key)
-		      (if (not (member key ignorevars))
-			  (let* ((val (cdr key))
-				 (sval (if (string-search whitesp val)(conc "\"" val "\"") val)))
-			    (print "export " (car key) "=" sval))))
+		      (let* ((val (cdr key))
+			     (sval (if (string-search whitesp val)(conc "\"" val "\"") val)))
+			(print (if (member key ignorevars)
+				   "# export "
+				   "export ")
+			       (car key) "=" sval)))
                     envvars)))))
 
 ;; set some env vars from an alist, return an alist with original values
 ;; (("VAR" "value") ...)
 (define (alist->env-vars lst)

Index: common_records.scm
==================================================================
--- common_records.scm
+++ common_records.scm
@@ -7,11 +7,11 @@
 ;;  This program is distributed WITHOUT ANY WARRANTY; without even the
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 ;;======================================================================
 
-(use trace)
+;; (use trace)
 
 (define (debug:calc-verbosity vstr)
   (cond
    ((number? vstr) vstr)
    ((not (string?  vstr))   1)

Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -165,10 +165,12 @@
 
 (define-inline (dboard:uidat-get-keycol  vec)(vector-ref vec 0))
 (define-inline (dboard:uidat-get-lftcol  vec)(vector-ref vec 1))
 (define-inline (dboard:uidat-get-header  vec)(vector-ref vec 2))
 (define-inline (dboard:uidat-get-runsvec vec)(vector-ref vec 3))
+
+(if (get-environment-variable "MT_RUN_AREA_HOME")(change-directory (get-environment-variable "MT_RUN_AREA_HOME")))
 
 (define (message-window msg)
   (iup:show
    (iup:dialog
     (iup:vbox 

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -139,11 +139,11 @@
 	       (inmem        (if local #f (db:open-inmem-db)))
 	       (refdb        (if local #f (db:open-inmem-db)))
 	       (db           (sqlite3:open-database dbpath))
 	       (olddb        (db:open-megatest-db))
 	       (write-access (file-write-access? dbpath))
-	       (handler      (make-busy-timeout 136000)))
+	       (handler      (make-busy-timeout 1000)))
 	  (if (and dbexists (not write-access))
 	      (set! *db-write-access* #f)) ;; only unset so other db's also can use this control
 	  (if write-access
 	      (begin
 		(if (not dbexists)
@@ -480,17 +480,24 @@
       #f))
 
 (define (open-run-close-exception-handling proc idb . params)
   (handle-exceptions
    exn
-   (begin
-     (debug:print 0 "EXCEPTION: database probably overloaded or unreadable.")
-     (debug:print 0 "  " ((condition-property-accessor 'exn 'message) exn))
-     (print-call-chain)
-     (thread-sleep! (random 120))
-     (debug:print-info 0 "trying db call one more time....")
-     (apply open-run-close-no-exception-handling proc idb params))
+   (let ((sleep-time (random 30))
+	 (err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
+     (case err-status
+       ((busy)
+	(thread-sleep! sleep-time))
+       (else
+	(debug:print 0 "EXCEPTION: database probably overloaded or unreadable.")
+	(debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
+	(print "exn=" (condition->list exn))
+	(debug:print 0 " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
+	(print-call-chain)
+	(thread-sleep! sleep-time)
+	(debug:print-info 0 "trying db call one more time....this may never recover, if necessary kill process " (current-process-id) " on host " (get-host-name) " to clean up")))
+     (apply open-run-close-exception-handling proc idb params))
    (apply open-run-close-no-exception-handling proc idb params)))
 
 ;; (define open-run-close 
 (define open-run-close ;; (if (debug:debug-mode 2)
 		;;	   open-run-close-no-exception-handling
@@ -611,10 +618,12 @@
                                 comment TEXT DEFAULT '',
                                 status TEXT DEFAULT 'n/a',
                                 type TEXT DEFAULT '',
                               CONSTRAINT test_data_constraint UNIQUE (test_id,category,variable));")
   (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_rundat (
+	      ;; Why use FULL here? This data is not that critical
+	      ;; (sqlite3:execute db "PRAGMA synchronous = FULL;")
                               id           INTEGER PRIMARY KEY,
                               test_id      INTEGER,
                               update_time  TIMESTAMP,
                               cpuload      INTEGER DEFAULT -1,
                               diskfree     INTEGER DEFAULT -1,
@@ -1807,10 +1816,17 @@
 	#f)
       #f))
 
 (define (db:tests-register-test dbstruct run-id test-name item-path)
   (sqlite3:execute (db:get-db dbstruct run-id) 'register-test run-id test-name item-path))
+       (let ((sleep-time (random 20))
+	     (err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
+	 (case err-status
+	   ((busy)(thread-sleep! 4))
+	   (else
+	    (debug:print 0 "WARNING: possible problem with call to cdb:remote-run, database may be read-only and locked, waiting and trying again ...")
+	    (thread-sleep! sleep-time)))
 
 (define (db:test-get-logfile-info dbstruct run-id test-name)
   (let ((res #f))
     (sqlite3:for-each-row 
      (lambda (path final_logf)
@@ -1976,10 +1992,35 @@
 			   (hash-table-set! tests-hash full-testname testdat))))
 		   results)
 		  (if (null? tal)
 		      (map cdr (hash-table->alist tests-hash)) ;; return a list of the most recent tests
 		      (loop (car tal)(cdr tal))))))))))
+			   (let* ((remtries 10)
+				  (proc     #f))
+			     (set! proc (lambda (remtries)
+					  (if (> remtries 0)
+					      (handle-exceptions
+					       exn
+					       (let ((sleep-time (random 30))
+						     (err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
+						 (case err-status
+						   ((busy)
+						    (thread-sleep! sleep-time)
+						    (proc 10)) ;; we never give up on busy
+						   (else
+						    (debug:print 0 "EXCEPTION: database probably overloaded or unreadable.")
+						    (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
+						    (debug:print 0 " status:  " ((condition-property-accessor 'sqlite3 'status)  exn))
+						    (print-call-chain)
+						    (debug:print 0 "Sleeping for " sleep-time)
+						    (thread-sleep! sleep-time)
+						    (debug:print-info 0 "trying db call one more time....this may never recover, if necessary kill process " (current-process-id) " on host " (get-host-name) " to clean up")
+						    (proc (- remtries 1)))))
+					       (apply sqlite3:execute db query params))
+					      (debug:print 0 "ERROR: too many attempts to access db were made and no sucess. query: "
+							   query ", params: " params))))
+			     (proc remtries))
 
 (define (db:test-get-records-for-index-file dbstruct run-id test-name)
   (let ((res '()))
     (sqlite3:for-each-row 
      (lambda (id itempath state status run_duration logf-id comment-id)

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -144,11 +144,11 @@
 	  (alist->env-vars env-ovrd)
 	  (set-megatest-env-vars run-id inkeys: keys inkeyvals: keyvals)
 	  (set-item-env-vars itemdat)
 	  (save-environment-as-files "megatest")
 	  ;; open-run-close not needed for test-set-meta-info
-	  (tests:set-full-meta-info test-id run-id 0 work-area)
+	  (tests:set-full-meta-info #f test-id run-id 0 work-area 10)
 
 	  ;; (tests:test-set-status! test-id "REMOTEHOSTSTART" "n/a" (args:get-arg "-m") #f)
 	  (tests:test-force-state-status! run-id test-id "REMOTEHOSTSTART" "n/a")
 	  (thread-sleep! 0.3) ;; NFS slowness has caused grief here
 
@@ -302,11 +302,11 @@
 							  (round 
 							   (- 
 							    (current-seconds) 
 							    start-seconds)))))
 					(kill-tries 0))
-				   (tests:set-full-meta-info test-id run-id (calc-minutes) work-area)
+				   (tests:set-full-meta-info #f test-id run-id (calc-minutes) work-area 10)
 				   (let loop ((minutes   (calc-minutes)))
 				     (begin
 				       (set! kill-job? (or (test-get-kill-request run-id test-id) ;; run-id test-name itemdat))
 							   (and runtlim (let* ((run-seconds   (- (current-seconds) start-seconds))
 									       (time-exceeded (> run-seconds runtlim)))
@@ -314,40 +314,48 @@
 									      (begin
 										(debug:print-info 0 "KILLING TEST DUE TO TIME LIMIT EXCEEDED! Runtime=" run-seconds " seconds, limit=" runtlim)
 										#t)
 									      #f)))))
 				       ;; open-run-close not needed for test-set-meta-info
-				       (tests:update-central-meta-info run-id test-id (get-cpu-load) (get-df (current-directory))(calc-minutes) #f #f)
+				       (print "ERROR: EDIT ME")
+				       (exit 1)
+				       ;;(tests:update-central-meta-info run-id test-id (get-cpu-load) (get-df (current-directory))(calc-minutes) #f #f)
+				       ;;(tests:set-partial-meta-info #f test-id run-id minutes work-area 10)
 				       ;; (tests:set-partial-meta-info test-id run-id minutes work-area)
 				       (if kill-job? 
 					   (begin
 					     (mutex-lock! m)
 					     ;; NOTE: The pid can change as different steps are run. Do we need handshaking between this
 					     ;;       section and the runit section? Or add a loop that tries three times with a 1/4 second
 					     ;;       between tries?
 					     (let* ((pid (vector-ref exit-info 0)))
 					       (if (number? pid)
-						   (process-signal pid signal/kill)
-						   ;; (begin
-						   ;;   (debug:print 0 "WARNING: Request received to kill job (attempt # " kill-tries ")")
-						   ;;   (let ((processes (cmd-run->list (conc "pgrep -l -P " pid))))
-						   ;;     (for-each 
-						   ;;      (lambda (p)
-						   ;;        (let* ((parts  (string-split p))
-						   ;;      	 (p-id   (if (> (length parts) 0)
-						   ;;      		     (string->number (car parts))
-						   ;;      		     #f)))
-						   ;;          (if p-id
-						   ;;      	(begin
-						   ;;      	  (debug:print 0 "Killing " (cadr parts) "; kill -9  " p-id)
-						   ;;      	  (system (conc "kill -9 " p-id))))))
-						   ;;      (car processes))
-						   ;;     (system (conc "kill -9 -" pid))))
+						   (handle-exceptions
+						    exn
+						    (debug:print-info 0 "Unable to kill process with pid " pid ", possibly already killed.")
+						    ;;(process-signal pid signal/kill))
+						    (begin
+						      (debug:print 0 "WARNING: Request received to kill job (attempt # " kill-tries ")")
+						      (let ((processes (cmd-run->list (conc "pgrep -l -P " pid))))
+							(for-each 
+							 (lambda (p)
+							   (let* ((parts  (string-split p))
+								  (p-id   (if (> (length parts) 0)
+									      (string->number (car parts))
+									      #f)))
+							     (if p-id
+								 (begin
+								   (debug:print 0 "Killing " (cadr parts) "; kill -9  " p-id)
+								   ;; (process-signal pid signal/kill))))) ;; 
+								   (system (conc "kill -9 " p-id))))))
+							 (car processes)))
+						      (system (conc "kill -9 -" pid))
+						      (tests:test-set-status! test-id "KILLED"  "FAIL" (args:get-arg "-m") #f)))
 						   (begin
 						     (debug:print 0 "WARNING: Request received to kill job but problem with process, attempting to kill manager process")
-						     (tests:test-set-status! run-id test-id "KILLED"  "FAIL"
-								     (args:get-arg "-m") #f)
+						     ;;(tests:test-set-status! run-id test-id "KILLED"  "FAIL"
+						     (tests:test-set-status! trun-id est-id "KILLED"  "FAIL" (args:get-arg "-m") #f)
 						     (exit 1) ;; IS THIS NECESSARY OR WISE???
 						     )))
 					     (set! kill-tries (+ 1 kill-tries))
 					     (mutex-unlock! m)))
 				       (if keep-going

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -457,15 +457,11 @@
 		targets)
       (set! *didsomething* #t)))
 
 (define (full-runconfigs-read)
   (let* ((keys   (rmt:get-keys))
-	 (target (if (args:get-arg "-reqtarg")
-		     (args:get-arg "-reqtarg")
-		     (if (args:get-arg "-target")
-			 (args:get-arg "-target")
-			 #f)))
+	 (target (common:args-get-target))
 	 (key-vals (if target (keys:target->keyval keys target) #f))
 	 (sections (if target (list "default" target) #f))
 	 (data     (begin
 		     (setenv "MT_RUN_AREA_HOME" *toppath*)
 		     (if key-vals
@@ -521,12 +517,11 @@
 
 ;; since several actions can be specified on the command line the removal
 ;; is done first
 (define (operate-on action)
   (let* ((runrec (runs:runrec-make-record))
-	 (target (or (args:get-arg "-reqtarg")
-		     (args:get-arg "-target"))))
+	 (target (common:args-get-target)))
     (cond
      ((not target)
       (debug:print 0 "ERROR: Missing required parameter for " action ", you must specify -target or -reqtarg")
       (exit 1))
      ((not (args:get-arg ":runname"))
@@ -568,12 +563,13 @@
 	(args:get-arg "-get-run-status"))
     (general-run-call
      "-set-run-status"
      "set run status"
      (lambda (target runname keys keyvals)
-       (let* ((runsdat  (cdb:remote-run db:get-runs-by-patt #f keys runname (or (args:get-arg "-target")
-									       (args:get-arg "-reqtarg")) #f #f))
+       (let* ((runsdat  (cdb:remote-run db:get-runs-by-patt #f keys runname 
+					(common:args-get-target)
+					#f #f))
 	      (header   (vector-ref runsdat 0))
 	      (rows     (vector-ref runsdat 1)))
 	 (if (null? rows)
 	     (begin
 	       (debug:print-info 0 "No matching run found.")
@@ -599,12 +595,12 @@
 	       (testpatt (if (args:get-arg "-testpatt") 
 			     (args:get-arg "-testpatt") 
 			     "%"))
 	       (keys     (db:get-keys dbstruct))
 	       ;; (runsdat  (db:get-runs dbstruct runpatt #f #f '()))
-	       (runsdat  (db:get-runs-by-patt dbstruct keys runpatt (or (args:get-arg "-target")
-									(args:get-arg "-reqtarg")) #f #f))
+	       (runsdat  (db:get-runs-by-patt dbstruct keys runpatt (or (a(common:args:get-target)) ;;  rgs:get-arg "-target")
+					 #f #f))
 		;; (cdb:remote-run db:get-runs #f runpatt #f #f '()))
 	       (runs     (db:get-rows runsdat))
 	       (header   (db:get-header runsdat))
 	       (db-targets (args:get-arg "-list-db-targets"))
 	       (seen     (make-hash-table)))
@@ -991,11 +987,14 @@
 			 (logprofile (args:get-arg "-logpro"))
 			 (logfile    (conc stepname ".log"))
 			 (cmd        (if (null? remargs) #f (car remargs)))
 			 (params     (if cmd (cdr remargs) '()))
 			 (exitstat   #f)
-			 (shell      (last (string-split (get-environment-variable "SHELL") "/")))
+			 (shell      (let ((sh (get-environment-variable "SHELL") ))
+				       (if sh 
+					   (last (string-split sh "/"))
+					   "bash")))
 			 (redir      (case (string->symbol shell)
 				       ((tcsh csh ksh)    ">&")
 				       ((zsh bash sh ash) "2>&1 >")
 				       (else ">&")))
 			 (fullcmd    (conc "(" (string-intersperse 

Index: runconfig.scm
==================================================================
--- runconfig.scm
+++ runconfig.scm
@@ -11,12 +11,11 @@
 (include "common_records.scm")
 
 (define (setup-env-defaults fname run-id already-seen keyvals #!key (environ-patt #f)(change-env #t))
   (let* ((keys    (map car keyvals))
 	 (thekey  (if keyvals (string-intersperse (map (lambda (x)(if x x "-na-")) (map cadr keyvals)) "/")
-		      (or (args:get-arg "-reqtarg") 
-			  (args:get-arg "-target")
+		      (or (common:args-get-target)
 			  (get-environment-variable "MT_TARGET")
 			  (begin
 			    (debug:print 0 "ERROR: setup-env-defaults called with no run-id or -target or -reqtarg")
 			    "nothing matches this I hope"))))
 	 ;; Why was system disallowed in the reading of the runconfigs file?
@@ -60,12 +59,11 @@
     finaldat))
 
 (define (set-run-config-vars run-id keyvals targ-from-db)
   (push-directory *toppath*) ;; the push/pop doesn't appear to do anything ...
   (let ((runconfigf (conc  *toppath* "/runconfigs.config"))
-	(targ       (or (args:get-arg "-target")
-			(args:get-arg "-reqtarg")
+	(targ       (or (common:args-get-target)
 			targ-from-db
 			(get-environment-variable "MT_TARGET"))))
     (pop-directory)
     (if (file-exists? runconfigf)
 	(setup-env-defaults runconfigf run-id #t keyvals

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -43,12 +43,11 @@
 		               *configdat*
 		               (begin
 		                 (debug:print 0 "ERROR: Called setup in a non-megatest area, exiting")
 		                 (exit 1)))))
 	  (runrec      (runs:runrec-make-record))
-	  (target      (or (args:get-arg "-reqtarg")
-		           (args:get-arg "-target")))
+	  (target      (common:args-get-target))
 	  (runname     (or (args:get-arg ":runname")
 		           (args:get-arg "-runname")))
 	  (testpatt    (or (args:get-arg "-testpatt")
 		           (args:get-arg "-runtests")))
 	  (keys        (keys:config-get-fields mconfig))
@@ -90,12 +89,11 @@
 			  (configf:get-section runconfig section)))
 	      (list "default" target))
     (vector target runname testpatt keys keyvals envdat mconfig runconfig serverdat transport db toppath run-id)))
 
 (define (set-megatest-env-vars run-id #!key (inkeys #f)(inrunname #f)(inkeyvals #f))
-  (let* ((target      (or (args:get-arg "-reqtarg")
-			  (args:get-arg "-target")
+  (let* ((target      (or (common:args-get-target)
 			  (get-environment-variable "MT_TARGET")))
 	 (keys    (if inkeys    inkeys    (rmt:get-keys)))
 	 (keyvals (if inkeyvals inkeyvals (keys:target->keyval keys target)))
 	 (vals (hash-table-ref/default *env-vars-by-run-id* run-id #f)))
     ;; get the info from the db and put it in the cache
@@ -203,15 +201,15 @@
   (let* ((keys               (keys:config-get-fields *configdat*))
 	 (keyvals            (keys:target->keyval keys target))
 	 (run-id             (rmt:register-run keyvals runname "new" "n/a" user))  ;;  test-name)))
 	 (deferred          '()) ;; delay running these since they have a waiton clause
 	 (runconfigf         (conc  *toppath* "/runconfigs.config"))
-	 (required-tests    '())
 	 (test-records       (make-hash-table))
 	 (all-tests-registry (tests:get-all)) ;; (tests:get-valid-tests (make-hash-table) test-search-path)) ;; all valid tests to check waiton names
 	 (all-test-names     (hash-table-keys all-tests-registry))
-	 (test-names         (tests:filter-test-names all-test-names test-patts)))
+	 (test-names         (tests:filter-test-names all-test-names test-patts))
+	 (required-tests     test-names))
 
     (set-megatest-env-vars run-id inkeys: keys inrunname: runname) ;; these may be needed by the launching process
     (if (file-exists? runconfigf)
 	(setup-env-defaults runconfigf run-id *already-seen-runconfig-info* keyvals "pre-launch-env-vars")
 	(debug:print 0 "WARNING: You do not have a run config file: " runconfigf))
@@ -397,12 +395,13 @@
 
     (cond
      ;; all prereqs met, fire off the test
      ;; or, if it is a 'toplevel test and all prereqs not met are COMPLETED then launch
 
-     ((member (hash-table-ref/default test-registry (runs:make-full-test-name hed item-path) 'n/a)
-	      '(DONOTRUN removed)) ;; *common:cant-run-states-sym*) ;; '(COMPLETED KILLED WAIVED UNKNOWN INCOMPLETE)) ;; try to catch repeat processing of COMPLETED tests here
+     ((and (not (member 'toplevel testmode))
+	   (member (hash-table-ref/default test-registry (runs:make-full-test-name hed item-path) 'n/a)
+		   '(DONOTRUN removed CANNOTRUN))) ;; *common:cant-run-states-sym*) ;; '(COMPLETED KILLED WAIVED UNKNOWN INCOMPLETE)) ;; try to catch repeat processing of COMPLETED tests here
       (debug:print-info 1 "Test " hed " set to \"" (hash-table-ref test-registry (runs:make-full-test-name hed item-path)) "\". Removing it from the queue")
       (if (or (not (null? tal))
 	      (not (null? reg)))
 	  (list (runs:queue-next-hed tal reg reglen regfull)
 		(runs:queue-next-tal tal reg reglen regfull)
@@ -452,22 +451,25 @@
              ;;    		 prereqstrs))
 	     (give-up    #f))
 
 	;; We can get here when a prereq has not been run due to *it* having a prereq that failed.
 	;; We need to use this to dequeue this item as CANNOTRUN
-	(for-each (lambda (prereq)
-		    (if (eq? (hash-table-ref/default test-registry prereq 'justfine) 'CANNOTRUN)
-			(set! give-up #t)))
-		  prereqstrs)
+	;; 
+	(if (member testmode '(toplevel))
+	    (for-each (lambda (prereq)
+			(if (eq? (hash-table-ref/default test-registry prereq 'justfine) 'CANNOTRUN)
+			    (set! give-up #t)))
+		      prereqstrs))
+
 	(if (and give-up
 		 (not (and (null? tal)(null? reg))))
 	    (let ((trimmed-tal (mt:discard-blocked-tests run-id hed tal test-records))
 		  (trimmed-reg (mt:discard-blocked-tests run-id hed reg test-records)))
 	      (debug:print 1 "WARNING: test " hed " has discarded prerequisites, removing it from the queue")
 
 	      (let ((test-id (rmt:get-test-id run-id hed "")))
-		(mt:test-set-state-status-by-id test-id "DEQUED" "PREQ_FAIL" "Failed to run due to failed prerequisites"))
+		(mt:test-set-state-status-by-id test-id "DEQUEUED" "PREQ_FAIL" "Failed to run due to failed prerequisites"))
 	      
 	      (if (and (null? trimmed-tal)
 		       (null? trimmed-reg))
 		  #f
 		  (list (runs:queue-next-hed trimmed-tal trimmed-reg reglen regfull)
@@ -1386,26 +1388,21 @@
 
 ;; Since many calls to a run require pretty much the same setup 
 ;; this wrapper is used to reduce the replication of code
 (define (general-run-call switchname action-desc proc)
   (let ((runname (args:get-arg ":runname"))
-	(target  (if (args:get-arg "-target")
-		     (args:get-arg "-target")
-		     (args:get-arg "-reqtarg"))))
-	;; (th1     #f))
+	(target  (common:args-get-target)))
     (cond
      ((not target)
       (debug:print 0 "ERROR: Missing required parameter for " switchname ", you must specify the target with -target")
       (exit 3))
      ((not runname)
       (debug:print 0 "ERROR: Missing required parameter for " switchname ", you must specify the run name with :runname runname")
       (exit 3))
      (else
       (let ((db   #f)
-	    (keys #f)
-	    (target (or (args:get-arg "-reqtarg")
-			(args:get-arg "-target"))))
+	    (keys #f))
 	(if (not (setup-for-run))
 	    (begin 
 	      (debug:print 0 "Failed to setup, exiting")
 	      (exit 1)))
 	;; (if (args:get-arg "-server")

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -68,12 +68,12 @@
 (define (tests:glob-like-match patt str) 
   (let ((like (substring-index "%" patt)))
     (let* ((notpatt  (equal? (substring-index "~" patt) 0))
 	   (newpatt  (if notpatt (substring patt 1) patt))
 	   (finpatt  (if like
-			(string-substitute (regexp "%") ".*" newpatt)
-			(string-substitute (regexp "\\*") ".*" newpatt)))
+			(string-substitute (regexp "%") ".*" newpatt #f)
+			(string-substitute (regexp "\\*") ".*" newpatt #f)))
 	   (res      #f))
       ;; (print "tests:glob-like-match => notpatt: " notpatt ", newpatt: " newpatt ", finpatt: " finpatt)
       (set! res (string-match (regexp finpatt (if like #t #f)) str))
       (if notpatt (not res) res))))
 
@@ -636,23 +636,54 @@
       (rmt:general-call 'update-run-duration run-id minutes test-id))
   (if (and uname hostname)
       (rmt:general-call 'update-uname-host run-id uname hostname test-id)))
   
 ;; This one is for running with no db access (i.e. via rmt: internally)
-(define (tests:set-full-meta-info test-id run-id minutes work-area)
-  (let* ((num-records 0)
-	 (cpuload  (get-cpu-load))
-	 (diskfree (get-df (current-directory)))
-	 (uname    (get-uname "-srvpio"))
-	 (hostname (get-host-name)))
-    (tdb:remote-update-testdat-meta-info run-id test-id work-area cpuload diskfree minutes)
-    (tests:update-central-meta-info run-id test-id cpuload diskfree minutes uname hostname)))
-	  
-(define (tests:set-partial-meta-info test-id run-id minutes work-area)
+(define (tests:set-full-meta-info db test-id run-id minutes work-area remtries)
+;; (define (tests:set-full-meta-info test-id run-id minutes work-area)
+  (let ((remtries 10))
+    (handle-exceptions
+     exn
+     (if (> remtries 0)
+	 (begin
+	   (set! remtries (- remtries 1))
+	   (thread-sleep! 10)
+	   (tests:set-full-meta-info db test-id run-id minutes work-area (- remtries 1)))
+	 (let ((err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
+	   (debug:print 0 "ERROR: tried for over a minute to update meta info and failed. Giving up")
+	   (debug:print 0 "EXCEPTION: database probably overloaded or unreadable.")
+	   (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
+	   (print "exn=" (condition->list exn))
+	   (debug:print 0 " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
+	   (print-call-chain)))
+     (let* ((num-records 0) ;; (test:tdb-get-rundat-count tdb))
+	    (cpuload  (get-cpu-load))
+	    (diskfree (get-df (current-directory)))
+	    (uname    (get-uname "-srvpio"))
+	    (hostname (get-host-name)))
+       ;; (tests:update-testdat-meta-info drun-id test-id work-area cpuload diskfree minutes)
+       (tests:update-central-meta-info trun-id test-id cpuload diskfree minutes uname hostname)))))
+    
+(define (tests:set-partial-meta-info dest-id run-id minutes work-area remtries)
+;; (define (tests:set-partial-meta-info test-id run-id minutes work-area)
   (let* ((cpuload  (get-cpu-load))
-	 (diskfree (get-df (current-directory))))
-    (tdb:remote-update-testdat-meta-info run-id test-id work-area cpuload diskfree minutes)))
+	 (diskfree (get-df (current-directory)))
+	 (remtries 10))
+    (handle-exceptions
+     exn
+     (if (> remtries 0)
+	 (begin
+	   (set! remtries (- remtries 1))
+	   (thread-sleep! 10)
+	   (tests:set-full-meta-info db test-id run-id minutes work-area (- remtries 1)))
+	 (let ((err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
+	   (debug:print 0 "ERROR: tried for over a minute to update meta info and failed. Giving up")
+	   (debug:print 0 "EXCEPTION: database probably overloaded or unreadable.")
+	   (debug:print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
+	   (print "exn=" (condition->list exn))
+	   (debug:print 0 " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
+	   (print-call-chain)))
 	 
 ;;======================================================================
 ;; A R C H I V I N G
 ;;======================================================================
 

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -60,10 +60,13 @@
 
 test4 : cleanprep
 	@echo "WARNING: No longer running fullprep, test converage may be lessened"
 	cd fullrun;time $(MEGATEST) -debug $(DEBUG) -runtests % -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING)
 
+test4a : cleanprep
+	cd fullrun;time $(MEGATEST) -debug $(DEBUG) -runtests all_toplevel -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b -m "This is a comment specific to a run" -v $(LOGGING)
+
 # NOTE: Only one instance can be a server
 test5 : cleanprep
 	@echo "WARNING: No longer running fullprep, test converage may be lessened"
 	cd fullrun;sleep 0;$(MEGATEST) -runtests % -target $(TARGET) :runname $(RUNNAME)_aa -debug $(DEBUG) $(LOGGING) > aa.log 2> aa.log &
 	cd fullrun;sleep 3;$(MEGATEST) -runtests % -target $(TARGET) :runname $(RUNNAME)_ab -debug $(DEBUG) $(LOGGING) > ab.log 2> ab.log &

Index: tests/tests.scm
==================================================================
--- tests/tests.scm
+++ tests/tests.scm
@@ -31,6 +31,10 @@
 (let* ((unit-test-name (list-ref (argv) 4))
        (fname          (conc "../unittests/" unit-test-name ".scm")))
   (if (file-exists? fname)
       (load fname)
       (print "ERROR: Unit test " unit-test-name " not found in unittests directory")))
+ (list "abc" "abc/%" "ab%/c%" "~abc/c%" "abc/~c%" "a,b/c,%/d" "%/,%/a" "%/,%/a" "%/,%/a" "%" "%" "%/" "%/" "%abc%")
+ (list "abc" "abc"   "abcd"   "abc"     "abc"     "a"         "abc"     "def"    "ghi"   "a" "a"  "a"  "a" "abc")
+ (list   ""  ""      "cde"    "cde"     "cde"     ""            ""      "a"       "b"    ""  "b"  ""   "b" "abc")
+ (list   #t    #t       #t    #f           #f      #t           #t       #t       #f     #t  #t   #t    #f #t))