Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -22,13 +22,16 @@
 MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}')
 
 CSIPATH=$(shell which csi)
 CKPATH=$(shell dirname $(shell dirname $(CSIPATH)))
 # ARCHSTR=$(shell uname -m)_$(shell uname -r)
-ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
+# 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 : mtest dboard newdboard txtdb
+all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard newdboard txtdb
 
 refdb : txtdb/txtdb.scm
 	csc -I txtdb txtdb/txtdb.scm -o refdb
 
 mtest: $(OFILES) megatest.o
@@ -35,15 +38,15 @@
 	csc $(CSCOPTS) $(OFILES) megatest.o -o mtest
 
 dboard : $(OFILES) $(GOFILES) dashboard.scm
 	csc $(OFILES) dashboard.scm $(GOFILES) -o dboard
 
-newdboard : newdashboard.scm $(OFILES) $(GOFILES)
-	csc $(OFILES) $(GOFILES) newdashboard.scm -o newdboard
-
-$(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm
-	csc utils/revtagfsl.scm -o $(PREFIX)/bin/revtagfsl
+# newdboard : newdashboard.scm $(OFILES) $(GOFILES)
+# 	csc $(OFILES) $(GOFILES) newdashboard.scm -o newdboard
+# 
+# $(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 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
@@ -62,19 +65,19 @@
 $(OFILES) $(GOFILES) : common_records.scm 
 
 %.o : %.scm
 	csc $(CSCOPTS) -c $<
 
-$(PREFIX)/bin/.$(ARCHSTR)/mtest : $(PREFIX)/bin/.$(ARCHSTR) mtest
+$(PREFIX)/bin/.$(ARCHSTR)/mtest : mtest
 	@echo Installing to PREFIX=$(PREFIX)
 	$(INSTALL) mtest $(PREFIX)/bin/.$(ARCHSTR)/mtest
-	utils/mk_wrapper $(PREFIX) mtest > $(PREFIX)/bin/megatest
+	utils/mk_wrapper $(PREFIX) mtest $(PREFIX)/bin/megatest
 	chmod a+x $(PREFIX)/bin/megatest
 
 # $(PREFIX)/bin/newdboard : newdboard
 # 	$(INSTALL) newdboard $(PREFIX)/bin/newdboard
-# 	utils/mk_wrapper $(PREFIX) newdboard > $(PREFIX)/bin/newdashboard
+# 	utils/mk_wrapper $(PREFIX) newdboard $(PREFIX)/bin/newdashboard
 #	chmod a+x $(PREFIX)/bin/newdashboard
 
 $(HELPERS) : utils/mt_* 
 	$(INSTALL) $< $@
 	chmod a+x $@
@@ -107,14 +110,14 @@
 	$(INSTALL) $< $@
 	chmod a+x $@
 
 
 # install dashboard as dboard so wrapper script can be called dashboard
-$(PREFIX)/bin/.$(ARCHSTR)/dboard : $(PREFIX)/bin/.$(ARCHSTR) dboard $(FILES)
-	$(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard
-	utils/mk_wrapper $(PREFIX) dboard > $(PREFIX)/bin/dashboard
+$(PREFIX)/bin/.$(ARCHSTR)/dboard : dboard $(FILES)
+	utils/mk_wrapper $(PREFIX) dboard $(PREFIX)/bin/dashboard
 	chmod a+x $(PREFIX)/bin/dashboard
+	$(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard
 
 install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \
           $(PREFIX)/bin/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/refdb $(PREFIX)/bin/mt_xterm
 
 $(PREFIX)/bin/.$(ARCHSTR) : 

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -2065,19 +2065,19 @@
 		  (set! ever-seen #t)
 		  (cond
 		   ;; case 1, non-item (parent test) is 
 		   ((and (equal? item-path "") ;; this is the parent test
 			 is-completed
-			 (or is-ok (member mode '(toplevel itemmatch itemwait))))
+			 (or is-ok (not (null? (lset-intersection eq? mode '(toplevel itemmatch itemwait))))))
 		    (set! parent-waiton-met #t))
 		   ;; Special case for toplevel and KILLED
 		   ((and (equal? item-path "") ;; this is the parent test
 			 is-killed
-			 (eq? mode 'toplevel))
+			 (member 'toplevel mode))
 		    (set! parent-waiton-met #t))
 		   ;; For itemwait mode IFF the previous matching item is good the set parent-waiton-met
-		   ((and (member mode '(itemmatch itemwait))
+		   ((and (not (null? (lset-intersection eq? mode '(itemmatch itemwait))))
 			 ;; (not (equal? item-path "")) ;; this applies to both top level (to allow launching of next batch) and items
 			 same-itempath)
 		    (if (and is-completed is-ok)
 			(set! item-waiton-met #t))
 		    (if (and (equal? item-path "")
@@ -2084,14 +2084,14 @@
 			     (or is-completed is-running));; this is the parent, set it to run if completed or running
 			(set! parent-waiton-met #t)))
 		   ;; normal checking of parent items, any parent or parent item not ok blocks running
 		   ((and is-completed
 			 (or is-ok 
-			     (eq? mode 'toplevel))              ;; toplevel does not block on FAIL
-			 (and is-ok (eq? mode 'itemmatch))) ;; itemmatch blocks on not ok
+			     (member 'toplevel mode))              ;; toplevel does not block on FAIL
+			 (and is-ok (member 'itemmatch mode))) ;; itemmatch blocks on not ok
 		    (set! item-waiton-met #t)))))
-	      tests)
+		tests)
 	     ;; both requirements, parent and item-waiton must be met to NOT add item to
 	     ;; prereq's not met list
 	     (if (not (or parent-waiton-met item-waiton-met))
 		 (set! result (append (if (null? tests) (list waitontest-name) tests) result)))
 	     ;; if the test is not found then clearly the waiton is not met...

Index: db_records.scm
==================================================================
--- db_records.scm
+++ db_records.scm
@@ -26,11 +26,11 @@
 (define-inline (dbr:dbstruct-get-stime   vec)    (vector-ref  vec 8))
 (define-inline (dbr:dbstruct-get-inuse   vec)    (vector-ref  vec 9))
 (define-inline (dbr:dbstruct-get-refdb   vec)    (vector-ref  vec 10))
 (define-inline (dbr:dbstruct-get-locdbs  vec)    (vector-ref  vec 11))
 (define-inline (dbr:dbstruct-get-olddb   vec)    (vector-ref  vec 12))
-(define-inline (dbr:dbstruct-get-run-id  vec)    (vector-ref  vec 13))
+;; (define-inline (dbr:dbstruct-get-run-id  vec)    (vector-ref  vec 13))
 
 (define-inline (dbr:dbstruct-set-main!   vec val)(vector-set! vec 0 val))
 (define-inline (dbr:dbstruct-set-strdb!  vec val)(vector-set! vec 1 val))
 (define-inline (dbr:dbstruct-set-path!   vec val)(vector-set! vec 2 val))
 (define-inline (dbr:dbstruct-set-local!  vec val)(vector-set! vec 3 val))
@@ -41,11 +41,11 @@
 (define-inline (dbr:dbstruct-set-stime!  vec val)(vector-set! vec 8 val))
 (define-inline (dbr:dbstruct-set-inuse!  vec val)(vector-set! vec 9 val))
 (define-inline (dbr:dbstruct-set-refdb!  vec val)(vector-set! vec 10 val))
 (define-inline (dbr:dbstruct-set-locdbs! vec val)(vector-set! vec 11 val))
 (define-inline (dbr:dbstruct-set-olddb!  vec val)(vector-set! vec 12 val))
-(define-inline (dbr:dbstruct-set-run-id! vec val)(vector-set! vec 13 val))
+; (define-inline (dbr:dbstruct-set-run-id! vec val)(vector-set! vec 13 val))
 
 ;; constructor for dbstruct
 ;;
 (define (make-dbr:dbstruct #!key (path #f)(local #f))
   (let ((v (make-vector 14 #f)))

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -674,12 +674,12 @@
 	 (local-megatest  (let* ((lm  (car (argv)))
 				 (dir (pathname-directory lm))
 				 (exe (pathname-strip-directory lm)))
 			    (conc (if dir (conc dir "/") "")
 				  (case (string->symbol exe)
-				    ((dboard)    "megatest")
-				    ((mtest)     "megatest")
+				    ((dboard)    "../megatest")
+				    ((mtest)     "../megatest")
 				    ((dashboard) "megatest")
 				    (else exe)))))
 	 (test-sig   (conc test-name ":" (item-list->path itemdat))) ;; test-path is the full path including the item-path
 	 (work-area  #f)
 	 (toptest-work-area #f) ;; for iterated tests the top test contains data relevant for all

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -82,11 +82,11 @@
 		  full-list
 		  new-offset
 		  limit))
 	  full-list))))
 
-(define (mt:lazy-get-prereqs-not-met run-id waitons ref-item-path #!key (mode 'normal))
+(define (mt:lazy-get-prereqs-not-met run-id waitons ref-item-path #!key (mode '(normal)))
   (let* ((key    (list run-id waitons ref-item-path mode))
 	 (res    (hash-table-ref/default *pre-reqs-met-cache* key #f))
 	 (useres (let ((last-time (if (vector? res) (vector-ref res 0) #f)))
 		   (if last-time
 		       (< (current-seconds)(+ last-time 5))

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -222,11 +222,11 @@
 	   run-ids))))
 
 (define (rmt:get-run-ids-matching keynames target res)
   (rmt:send-receive #f 'get-run-ids-matching (list keynames target res)))
 
-(define (rmt:get-prereqs-not-met run-id waitons ref-item-path #!key (mode 'normal))
+(define (rmt:get-prereqs-not-met run-id waitons ref-item-path #!key (mode '(normal)))
   (rmt:send-receive 'get-prereqs-not-met run-id (list run-id waitons ref-item-path mode)))
 
 (define (rmt:get-count-tests-running-for-run-id run-id)
   (rmt:send-receive 'get-count-tests-running-for-run-id run-id (list run-id)))
 

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -387,11 +387,11 @@
 		      "\n testname:        " hed
 		      "\n prereqs-not-met: " (runs:pretty-string prereqs-not-met)
 		      "\n non-completed:   " (runs:pretty-string non-completed) 
 		      "\n fails:           " (runs:pretty-string fails)
 		      "\n testmode:        " testmode
-		      "\n (eq? testmode 'toplevel): " (eq? testmode 'toplevel)
+		      "\n (member 'toplevel testmode): " (member 'toplevel testmode)
 		      "\n (null? non-completed):    " (null? non-completed)
 		      "\n reruns:          " reruns
 		      "\n items:           " items
 		      "\n can-run-more:    " can-run-more)
 
@@ -420,13 +420,13 @@
 		(set! runs:nothing-left-in-queue-count (+ runs:nothing-left-in-queue-count 1)))
 	    #f)))
 
      ;; 
      ((or (null? prereqs-not-met)
-	  (and (eq? testmode 'toplevel)
+	  (and (member 'toplevel testmode)
 	       (null? non-completed)))
-      (debug:print-info 4 "runs:expand-items: (or (null? prereqs-not-met) (and (eq? testmode 'toplevel)(null? non-completed)))")
+      (debug:print-info 4 "runs:expand-items: (or (null? prereqs-not-met) (and (member 'toplevel testmode)(null? non-completed)))")
       (let ((test-name (tests:testqueue-get-testname test-record)))
 	(setenv "MT_TEST_NAME" test-name) ;; 
 	(setenv "MT_RUNNAME"   runname)
 	(set-megatest-env-vars run-id inrunname: runname) ;; these may be needed by the launching process
 	(let ((items-list (items:get-items-from-config tconfig)))
@@ -540,11 +540,11 @@
 	    (list (runs:queue-next-hed tal reg reglen regfull)
 		  (runs:queue-next-tal tal reg reglen regfull)
 		  (runs:queue-next-reg tal reg reglen regfull)
 		  reruns))))
 
-     ((and (not (null? fails))(eq? testmode 'normal))
+     ((and (not (null? fails))(member 'normal testmode))
       (debug:print-info 1 "test "  hed " (mode=" testmode ") has failed prerequisite(s); "
 			(string-intersperse (map (lambda (t)(conc (db:test-get-testname t) ":" (db:test-get-state t)"/"(db:test-get-status t))) fails) ", ")
 			", removing it from to-do list")
       (if (or (not (null? reg))(not (null? tal)))
 	  (begin
@@ -553,11 +553,11 @@
 		  (runs:queue-next-tal tal reg reglen regfull)
 		  (runs:queue-next-reg tal reg reglen regfull)
 		  (cons hed reruns)))
 	  #f)) ;; #f flags do not loop
 
-     ((and (not (null? fails))(eq? testmode 'toplevel))
+     ((and (not (null? fails))(member 'toplevel testmode))
       (if (or (not (null? reg))(not (null? tal)))
 	   (list (car newtal)(append (cdr newtal) reg) '() reruns)
 	  #f)) 
      (else
       (debug:print 1 "WARNING: FAILS or incomplete tests are preventing completion of this run. Dropping test " hed " from the run queue")
@@ -792,11 +792,11 @@
       (let* ((test-record (hash-table-ref test-records hed))
 	     (test-name   (tests:testqueue-get-testname test-record))
 	     (tconfig     (tests:testqueue-get-testconfig test-record))
 	     (jobgroup    (config-lookup tconfig "test_meta" "jobgroup"))
 	     (testmode    (let ((m (config-lookup tconfig "requirements" "mode")))
-			    (if m (string->symbol m) 'normal)))
+			    (if m (map string->symbol (string-split m)) '(normal))))
 	     (waitons     (tests:testqueue-get-waitons    test-record))
 	     (priority    (tests:testqueue-get-priority   test-record))
 	     (itemdat     (tests:testqueue-get-itemdat    test-record)) ;; itemdat can be a string, list or #f
 	     (items       (tests:testqueue-get-items      test-record))
 	     (item-path   (item-list->path itemdat))

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -22,11 +22,11 @@
 
 all : test1 test2 test3 test4 test5 test6 test7 test8 test9
 
 server :
 	cd ..;make;make install
-	cd fullrun;../../bin/megatest -server - -debug $(DEBUG) -run-id $(RUNID)
+	cd fullrun;$(MEGATEST) -server - -debug $(DEBUG) -run-id $(RUNID)
 
 stopserver :
 	cd ..;make && make install
 	cd fullrun;$(MEGATEST) -stop-server 0
 

Index: utils/mk_wrapper
==================================================================
--- utils/mk_wrapper
+++ utils/mk_wrapper
@@ -1,18 +1,17 @@
 #!/bin/bash
 
 prefix=$1
 cmd=$2
+target=$3
 
-echo "#!/bin/bash"
 if [ "$LD_LIBRARY_PATH" != "" ];then
   echo "INFO: Using LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >&2
-  echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+  echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" > $prefix/bin/.$(lsb_release -sr)/cfg.sh
 else
   echo "INFO: LD_LIBRARY_PATH not set" >&2
 fi
 
-# echo 'ARCHSTR=$(uname -m)_$(uname -r)'
+echo "#!/bin/bash" > $target
+echo "source $prefix/bin/.\$(lsb_release -sr)/cfg.sh" >> $target
+echo "exec $prefix/bin/.\$(lsb_release -sr)/$cmd \"\$@\"" >> $target
 
-fullcmd="exec $prefix/bin/.${MACHTYPE}/$cmd"
-
-echo "$fullcmd \"\$@\""