Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -621,11 +621,11 @@
 
 ;; states and statuses are lists, turn them into ("PASS","FAIL"...) and use NOT IN
 ;; i.e. these lists define what to NOT show.
 ;; states and statuses are required to be lists, empty is ok
 ;; not-in #t = above behaviour, #f = must match
-(define (db:get-tests-for-run db run-id testpatt itempatt states statuses 
+(define (db:get-tests-for-run db run-id testpatt states statuses 
 			      #!key (not-in #t)
 			      (sort-by #f) ;; 'rundir 'event_time
 			      )
   (let* ((res '())
 	 ;; if states or statuses are null then assume match all when not-in is false
@@ -635,13 +635,11 @@
 				   (not (null? states)))
 			       (conc " AND " (if not-in "NOT" "") " (" states-str " AND " statuses-str ") ")
 			       ""))
 	 (qry      (conc "SELECT id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment "
 			 " FROM tests WHERE run_id=? AND "
-			 ;; testname like ? AND item_path LIKE ? " 
-			 (db:patt->like "testname" testpatt) " AND "
-			 (db:patt->like "item_path" itempatt)
+			 (tests:match->sqlqry testpatt)
 			 state-status-qry
 			 (case sort-by
 			   ((rundir)     " ORDER BY length(rundir) DESC;")
 			   ((event_time) " ORDER BY event_time ASC;")
 			   (else         ";"))
@@ -920,24 +918,24 @@
 ;;======================================================================
 ;; Misc. test related queries
 ;;======================================================================
 
 (define (db:test-get-paths-matching db keynames target fnamepatt #!key (res '()))
-  (let* ((itempatt   (if (args:get-arg "-itempatt")(args:get-arg "-itempatt") "%"))
-	 (testpatt   (if (args:get-arg "-testpatt")(args:get-arg "-testpatt") "%"))
+  (let* ((testpatt   (if (args:get-arg "-testpatt")(args:get-arg "-testpatt") "%"))
 	 (statepatt  (if (args:get-arg ":state")   (args:get-arg ":state")    "%"))
 	 (statuspatt (if (args:get-arg ":status")  (args:get-arg ":status")   "%"))
 	 (runname    (if (args:get-arg ":runname") (args:get-arg ":runname")  "%"))
 	 (keystr (string-intersperse 
 		  (map (lambda (key val)
 			 (conc "r." key " like '" val "'"))
 		       keynames 
 		       (string-split target "/"))
 		  " AND "))
+	 (testqry (tests:match->sqlqry testpatt))
 	 (qrystr (conc "SELECT t.rundir FROM tests AS t INNER JOIN runs AS r ON t.run_id=r.id WHERE "
-		       keystr " AND r.runname LIKE '" runname "' AND item_path LIKE '" itempatt "' AND testname LIKE '"
-		       testpatt "' AND t.state LIKE '" statepatt "' AND t.status LIKE '" statuspatt 
+		       keystr " AND r.runname LIKE '" runname "' AND " testqry
+		       "' AND t.state LIKE '" statepatt "' AND t.status LIKE '" statuspatt 
 		       "'ORDER BY t.event_time ASC;")))
     (debug:print 3 "qrystr: " qrystr)
     (sqlite3:for-each-row 
      (lambda (p)
        (set! res (cons p res)))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -251,11 +251,10 @@
 	  (exit 1))
 	;; put test parameters into convenient variables
 	(runs:operate-on  action
 			  (args:get-arg ":runname")
 			  (args:get-arg "-testpatt")
-			  (args:get-arg "-itempatt")
 			  state: (args:get-arg ":state") 
 			  status: (args:get-arg ":status")
 			  new-state-status: (args:get-arg "-set-state-status")))
     (set! *didsomething* #t))))
 	  
@@ -280,11 +279,10 @@
 (if (args:get-arg "-list-runs")
     (if (setup-for-run)
 	(let* ((db       #f)
 	       (runpatt  (args:get-arg "-list-runs"))
 	       (testpatt (args:get-arg "-testpatt"))
-	       (itempatt (args:get-arg "-itempatt"))
 	       (runsdat  (open-run-close db:get-runs db runpatt #f #f '()))
 	       (runs     (db:get-rows runsdat))
 	       (header   (db:get-header runsdat))
 	       (keys     (open-run-close db:get-keys db))
 	       (keynames (map key:get-fieldname keys)))
@@ -297,11 +295,11 @@
 						   keynames) "/")
 			  "/"
 			  (db:get-value-by-header run header "runname")
 			  " status: " (db:get-value-by-header run header "state"))
 	     (let ((run-id (open-run-close db:get-value-by-header run header "id")))
-	       (let ((tests (open-run-close db:get-tests-for-run db run-id testpatt itempatt '() '())))
+	       (let ((tests (open-run-close db:get-tests-for-run db run-id testpatt '() '())))
 		 ;; Each test
 		 (for-each 
 		  (lambda (test)
 		    (format #t
 			    "  Test: ~25a State: ~15a Status: ~15a Runtime: ~5@as Time: ~22a Host: ~10a\n"

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -74,10 +74,32 @@
 				 (tests:glob-like-match (if item-patt item-patt "") itempath)))
 			#t
 			(if (null? tal)
 			    #f
 			    (loop (car tal)(cdr tal)))))))))))
+
+;; if itempath is #f then look only at the testname part
+;;
+(define (tests:match->sqlqry patterns)
+  (if (string? patterns)
+      (let ((patts (string-split patterns ",")))
+	(if (null? patts) ;;; no pattern(s) means no match, we will do no query
+	    ""
+	    (let loop ((patt (car patts))
+		       (tal  (cdr patts))
+		       (res  '()))
+	      ;; (print "loop: patt: " patt ", tal " tal)
+	      (let* ((patt-parts (string-match (regexp "^([^\\/]*)(\\/(.*)|)$") patt))
+		     (test-patt  (cadr patt-parts))
+		     (item-patt  (cadddr patt-parts))
+		     (test-qry   (db:patt->like "testname" test-patt))
+		     (item-qry   (db:patt->like "item_path" item-patt))
+		     (qry        (conc "(" test-qry " AND " item-qry ")")))
+		;; (print "tests:match => patt-parts: " patt-parts ", test-patt: " test-patt ", item-patt: " item-patt)
+		(if (null? tal)
+		    (string-intersperse (append (reverse res)(list qry)) " OR ")
+		    (loop (car tal)(cdr tal)(cons qry res)))))))))
 
 ;; get the previous record for when this test was run where all keys match but runname
 ;; returns #f if no such test found, returns a single test record if found
 (define (test:get-previous-test-run-record db run-id test-name item-path)
   (let* ((keys    (db:get-keys db))

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -26,12 +26,12 @@
 	mkdir -p simplelinks simpleruns
 	cd simplerun;cp ../../*_records.scm .;perl -pi.bak -e 's/define-inline/define/' *_records.scm
 	cd simplerun;echo '(load "../tests.scm")' | $(MEGATEST) -repl -debug $(DEBUG)
 
 test2 : fullprep
-	cd fullrun;$(MEGATEST) -runtests ez_pass,runfirst/a/% -reqtarg ubuntu/nfs/none -itempatt a/1 :runname $(RUNNAME)_a $(SERVER)
-	cd fullrun;sleep 20;megatest -target ubuntu/nfs/none :runname $(RUNNAME) -set-state-status :state COMPLETED :status FORCED -testpatt runfirst -itempatt ''
+	cd fullrun;$(MEGATEST) -runtests ez_pass,runfirst/a/% -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_a $(SERVER)
+	cd fullrun;sleep 20;megatest -target ubuntu/nfs/none :runname $(RUNNAME) -set-state-status :state COMPLETED :status FORCED -testpatt runfirst/% 
 
 
 test3 : fullprep
 	cd fullrun;$(MEGATEST) -runtests runfirst -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_b  $(SERVER) -debug 10
 

Index: tests/tests.scm
==================================================================
--- tests/tests.scm
+++ tests/tests.scm
@@ -20,19 +20,22 @@
 	(string-search (regexp "No such file or directory")(car reslst))))
 
 ;;======================================================================
 ;; T E S T   M A T C H I N G
 ;;======================================================================
+
+;; tests:glob-like-match
 (test #f '("abc") (tests:glob-like-match "abc" "abc"))
 (for-each 
  (lambda (patt str expected)
    (test (conc patt " " str "=>" expected) expected (tests:glob-like-match patt str)))
  (list "abc"    "~abc" "~abc" "a*c"  "a%c")
  (list "abc"    "abcd" "abc"  "ABC"  "ABC")
  (list '("abc")  #t      #f     #f '("ABC"))
  )
 
+;; tests:match
 (test #f #t (tests:match "abc/def" "abc" "def"))
 (for-each 
  (lambda (patterns testname itempath expected)
    (test (conc patterns " " testname "/" itempath "=>" expected)
 	 expected 
@@ -39,10 +42,23 @@
 	 (tests:match patterns testname itempath)))
  (list "abc" "abc/%" "ab%/c%" "~abc/c%" "abc/~c%" "a,b/c,%/d")
  (list "abc" "abc"   "abcd"   "abc"     "abc"     "a"        )
  (list   ""  ""      "cde"    "cde"     "cde"     ""         )
  (list   #t    #t       #t    #f           #f      #t))
+
+;; db:patt->like
+(test #f "testname LIKE 't%'" (db:patt->like "testname" "t%" comparator: " AND "))
+(test #f "testname LIKE 't%' AND testname LIKE '%t'" (db:patt->like "testname" "t%,%t" comparator: " AND "))
+(test #f "item_path GLOB ''" (db:patt->like "item_path" ""))
+
+;; 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%"))
+
+;; (exit)
 
 ;;======================================================================
 ;; C O N F I G   F I L E S 
 ;;======================================================================
 
@@ -229,10 +245,12 @@
 			      (file-exists? "../simpleruns/key1/key2/myrun/test1/testdat.db")))
 (test "Get steps for test" #t (> (length (db:get-steps-for-test db test-id)) 0))
 (test "Get nice table for steps" "2.0s"
       (begin
 	(vector-ref (hash-table-ref (db:get-steps-table db test-id) "step1") 4)))
+
+(exit)
 
 ;;======================================================================
 ;; R E M O T E   C A L L S 
 ;;======================================================================