Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -3177,11 +3177,11 @@
 ;; Note: mode 'normal means that tests must be COMPLETED and ok (i.e. PASS, WARN, CHECK, SKIP or WAIVED)
 ;;       mode 'toplevel means that tests must be COMPLETED only
 ;;       mode 'itemmatch or 'itemwait means that tests items must be COMPLETED and (PASS|WARN|WAIVED|CHECK) [[ NB// NOT IMPLEMENTED YET ]]
 ;; 
 ;; (define (db:get-prereqs-not-met dbstruct run-id waitons ref-item-path mode)
-(define (db:get-prereqs-not-met dbstruct run-id waitons ref-item-path #!key (mode '(normal))(itemmap #f))
+(define (db:get-prereqs-not-met dbstruct run-id waitons ref-item-path mode itemmap) ;; #!key (mode '(normal))(itemmap #f))
   (if (or (not waitons)
 	  (null? waitons))
       '()
       (let* ((unmet-pre-reqs '())
 	     (result         '()))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -7,10 +7,12 @@
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 
 ;; (include "common.scm")
 ;; (include "megatest-version.scm")
+
+(define (toplevel-command . a) #f)
 
 (define (toplevel-command . a) #f)
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -498,12 +498,12 @@
 	   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)))
-  (rmt:send-receive 'get-prereqs-not-met run-id (list run-id waitons ref-item-path mode)))
+(define (rmt:get-prereqs-not-met run-id waitons ref-item-path #!key (mode '(normal))(itemmap #f))
+  (rmt:send-receive 'get-prereqs-not-met run-id (list run-id waitons ref-item-path mode itemmap)))
 
 (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)))
 
 ;; Statistical queries

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -478,11 +478,11 @@
 
 (define runs:nothing-left-in-queue-count 0)
 
 (define (runs:expand-items hed tal reg reruns regfull newtal jobgroup max-concurrent-jobs run-id waitons item-path testmode test-record can-run-more items runname tconfig reglen test-registry test-records itemmap)
   (let* ((loop-list       (list hed tal reg reruns))
-	 (prereqs-not-met (rmt:get-prereqs-not-met run-id waitons item-path testmode itemmap: itemmap))
+	 (prereqs-not-met (rmt:get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
 	 ;; (prereqs-not-met (mt:lazy-get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
 	 (fails           (runs:calc-fails prereqs-not-met))
 	 (prereq-fails    (runs:calc-prereq-fail prereqs-not-met))
 	 (non-completed   (runs:calc-not-completed prereqs-not-met))
 	 (runnables       (runs:calc-runnable prereqs-not-met)))
@@ -666,11 +666,11 @@
 	 (have-resources          (car run-limits-info))
 	 (num-running             (list-ref run-limits-info 1))
 	 (num-running-in-jobgroup (list-ref run-limits-info 2)) 
 	 (max-concurrent-jobs     (list-ref run-limits-info 3))
 	 (job-group-limit         (list-ref run-limits-info 4))
-	 (prereqs-not-met         (rmt:get-prereqs-not-met run-id waitons item-path testmode itemmap: itemmap))
+	 (prereqs-not-met         (rmt:get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
 	 ;; (prereqs-not-met         (mt:lazy-get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
 	 (fails                   (runs:calc-fails prereqs-not-met))
 	 (non-completed           (filter (lambda (x)             ;; remove hed from not completed list, duh, of course it is not completed!
 					    (not (equal? x hed)))
 					  (runs:calc-not-completed prereqs-not-met)))

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -21,11 +21,11 @@
 NEWTARGET  = "$(OS)/$(FS)/$(VER)"
 TARGET     = "ubuntu/nfs/none"
 
 all : build unit test1 test2 test3 test4 test5 test6 test7 test8 test9
 
-unit : basicserver.log runs.log
+unit : basicserver.log runs.log misc.log
 
 ## basicserver.log : unittests/basicserver.scm
 ## 	script -c "./rununittest.sh basicserver $(DEBUG)" basicserver.log
 
 %.log : build unittests/%.scm

Index: tests/fdktestqa/testqa/Makefile
==================================================================
--- tests/fdktestqa/testqa/Makefile
+++ tests/fdktestqa/testqa/Makefile
@@ -23,10 +23,11 @@
 
 bigrun3 :
 	$(MEGATEST) -runtests bigrun3 -target a/bigrun3 :runname $(RUNNAME)
 
 dashboard : 
+	mkdir -p ../simpleruns
 	$(DASHBOARD) -rows 20 &
 
 newdashboard :
 	$(NEWDASHBOARD) &
 

Index: tests/unittests/misc.scm
==================================================================
--- tests/unittests/misc.scm
+++ tests/unittests/misc.scm
@@ -40,6 +40,12 @@
 ;; test:match->sqlqry
 (test #f "(testname GLOB 'a' AND item_path GLOB 'b') OR (testname LIKE 'a%' AND item_path LIKE '%') OR (testname GLOB '' AND item_path LIKE 'b%')"
       (tests:match->sqlqry "a/b,a%,/b%"))
 (test #f "(testname GLOB 'a' AND item_path GLOB 'b') OR (testname LIKE 'a%' AND item_path LIKE '%') OR (testname LIKE '%' AND item_path LIKE 'b%')"
       (tests:match->sqlqry "a/b,a%,%/b%"))
+
+;;======================================================================
+;; itemwait, itemmatch
+(db:compare-itempaths ref-item-path item-path itemmap)
+
+(exit)