Index: dashboard.scm
==================================================================
--- dashboard.scm
+++ dashboard.scm
@@ -138,11 +138,21 @@
 (define *status-ignore-hash* (make-hash-table))
 (define *state-ignore-hash*  (make-hash-table))
 
 (define *db-file-path* (conc *toppath* "/megatest.db"))
 
-(define *tests-sort-reverse* #f)
+(define *tests-sort-options* (vector (vector "Sort +a" 'testname   "ASC")
+				     (vector "Sort -a" 'testname   "DESC")
+				     (vector "Sort +t" 'event_time "ASC")
+				     (vector "Sort -t" 'event_time "DESC")))
+(define (next-sort-option)
+  (if (>= *tests-sort-reverse* 3)
+      (set! *tests-sort-reverse* 0)
+      (set! *tests-sort-reverse* (+ *tests-sort-reverse* 1)))
+  *tests-sort-reverse*)
+
+(define *tests-sort-reverse* 0)
 (define *hide-empty-runs* #f)
 
 (define *current-tab-number* 0)
 (define *updaters* (make-hash-table))
 
@@ -195,14 +205,16 @@
 	 (statuses    (hash-table-keys *status-ignore-hash*)))
     ;; 
     ;; trim runs to only those that are changing often here
     ;; 
     (for-each (lambda (run)
-		(let* ((run-id   (db:get-value-by-header run header "id"))
-		       (tests    (let ((tsts (mt:get-tests-for-run run-id testnamepatt states statuses)))
-				   (if *tests-sort-reverse* (reverse tsts) tsts)))
-		       (key-vals (cdb:remote-run db:get-key-vals #f run-id)))
+		(let* ((run-id     (db:get-value-by-header run header "id"))
+		       (sort-info  (vector-ref *tests-sort-options* *tests-sort-reverse*))
+		       (sort-by    (vector-ref sort-info 1))
+		       (sort-order (vector-ref sort-info 2))
+		       (tests      (mt:get-tests-for-run run-id testnamepatt states statuses sort-by: sort-by sort-order: sort-order))
+		       (key-vals   (cdb:remote-run db:get-key-vals #f run-id)))
 		  ;; Not sure this is needed?
 		  (set! referenced-run-ids (cons run-id referenced-run-ids))
 		  (if (> (length tests) maxtests)
 		      (set! maxtests (length tests)))
 		  (if (or (not *hide-empty-runs*) ;; this reduces the data burden when set
@@ -268,17 +280,35 @@
 	 (vlst-s1 (sort vlst (lambda (a b)
 			       (let ((astr (vector-ref a 1))
 				     (bstr (vector-ref b 1)))
 				 (if (string=? astr "") #f #t)))))
 			;; (>= (string-length (vector-ref a 1))(string-length (vector-ref b 1))))))
-	 (vlst-s2 (sort vlst-s1 (lambda (a b)
-			   	  (string>= (vector-ref a 0)(vector-ref b 0))))))
+	 (vlst-s2 (sort vlst-s1
+			(lambda (a b)
+			  (string>= (vector-ref a 0)(vector-ref b 0)))))
+	 (vlst-s3 (sort vlst
+	 		(lambda (a b)
+	 		  (let ((tname-a (vector-ref a 0))
+	 			(tname-b (vector-ref b 0))
+	 			(ipath-a (vector-ref a 1))
+	 			(ipath-b (vector-ref b 1)))
+	 		    (cond
+			     ((and (equal? tname-a tname-b)
+				   (equal? ipath-a ""))
+			      #t)
+			     ((and (not (equal? tname-a tname-b))
+				   (equal? ipath-b "")
+				   (not (equal? ipath-a "")))
+	 			#t)
+			     (else #f)))))))
+	 ;; (parents-first (bubble-up vlst)))
     (map (lambda (x)
 	   (if (equal? (vector-ref x 1) "")
 	       (vector-ref x 0)
 	       (conc (vector-ref x 0) "(" (vector-ref x 1) ")")))
-	 vlst-s2)))
+	 vlst-s2
+	 )))
     
 (define (update-labels uidat)
   (let* ((rown    0)
 	 (keycol  (dboard:uidat-get-keycol uidat))
 	 (lftcol  (dboard:uidat-get-lftcol uidat))
@@ -301,10 +331,34 @@
 	      (vector-set! keycol i newval)
 	      (iup:attribute-set! lbl "TITLE" munged-val)))
 	(iup:attribute-set! lbl "FGCOLOR" (if (hash-table-ref/default *collapsed* newval #f) "0 112 112" "0 0 0"))
 	(if (< i maxn)
 	    (loop (+ i 1)))))))
+
+;; ;; inlst is list of vectors < testname itempath >
+;; ;;
+;; (define (bubble-up inlst)
+;;   (let ((tnames (delete-duplicates (map (lambda (x)(vector-ref x 0)) inlst))))
+;;     (if (null? inlst)
+;; 	inlst
+;; 	(let loop ((hed (car inlst))
+;; 		   (tal (cdr inlst))
+;; 		   (res '())
+;; 		   (cur (car tnames))
+;; 		   (rem (cdr tnames)))
+;; 	  (let ((tname (vector-ref hed 0))
+;; 		(ipath (vector-ref hed 1)))
+;; 	    (if (equal? tname cur)
+;; 		(if (null? tal)
+;; 		    (append res (list hed))
+;; 		    (loop (car tal)
+;; 			  (cdr tal)
+;; 			  (append res (list hed))
+;; 			  cur
+;; 			  rem))
+;; 		(if (null? tal)
+;; 		    (
 
 (define (update-buttons uidat numruns numtests)
   (let* ((runs        (if (> (length *allruns*) numruns)
 			  (take-right *allruns* numruns)
 			  (pad-list *allruns* numruns)))
@@ -1091,23 +1145,23 @@
 	      ;;  		      (mark-for-update)
 	      ;;  		      (update-search "item-name" val))
 	      ))
 	    (iup:vbox
 	     (iup:hbox
-	      (iup:button "Sort" #:action (lambda (obj)
-					    (set! *tests-sort-reverse* (not *tests-sort-reverse*))
-					    (iup:attribute-set! obj "TITLE" (if *tests-sort-reverse* "+Sort" "-Sort"))
-					    (mark-for-update)))
+	      (iup:button "Sort +a "   #:action (lambda (obj)
+						 (next-sort-option)
+						 (iup:attribute-set! obj "TITLE" (vector-ref (vector-ref *tests-sort-options* *tests-sort-reverse*) 0))
+						 (mark-for-update)))
 	      (iup:button "HideEmpty" #:action (lambda (obj)
 						 (set! *hide-empty-runs* (not *hide-empty-runs*))
 						 (iup:attribute-set! obj "TITLE" (if *hide-empty-runs* "+Hide" "-Hide"))
-						 (mark-for-update)))
-	      (iup:button "Refresh"   #:action (lambda (obj)
 						 (mark-for-update))))
 	     (iup:hbox
-	      (iup:button "Quit" #:action (lambda (obj)(if *db* (sqlite3:finalize! *db*))(exit)))
-	      (iup:button "Monitor" #:action (lambda (obj)(system (conc (car (argv))" -guimonitor &")))))
+	      (iup:button "Quit"      #:action (lambda (obj)(if *db* (sqlite3:finalize! *db*))(exit)))
+	      (iup:button "Refresh"   #:action (lambda (obj)
+						 (mark-for-update))))
+	     ;; (iup:button "Monitor" #:action (lambda (obj)(system (conc (car (argv))" -guimonitor &")))))
 	     ))
 	   ;; (iup:button "<-  Left" #:action (lambda (obj)(set! *start-run-offset*  (+ *start-run-offset* 1))))
 	   ;; (iup:button "Up     ^" #:action (lambda (obj)(set! *start-test-offset* (if (> *start-test-offset* 0)(- *start-test-offset* 1) 0))))
 	   ;; (iup:button "Down   v" #:action (lambda (obj)(set! *start-test-offset* (if (>= *start-test-offset* (length *alltestnamelst*))(length *alltestnamelst*)(+ *start-test-offset* 1)))))
 	   ;; (iup:button "Right ->" #:action (lambda (obj)(set! *start-run-offset*  (if (> *start-run-offset* 0)(- *start-run-offset* 1) 0))))

Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -905,15 +905,14 @@
 
 ;; 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 states statuses offset limit not-in sort-by
+(define (db:get-tests-for-run db run-id testpatt states statuses offset limit not-in sort-by sort-order
 			      #!key
 			      (qryvals #f)
 			      )
-  (debug:print-info 11 "db:get-tests-for-run START run-id=" run-id ", testpatt=" testpatt ", states=" states ", statuses=" statuses ", not-in=" not-in ", sort-by=" sort-by)
   (let* ((qryvals         (if qryvals qryvals "id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment"))
 	 (res            '())
 	 ;; if states or statuses are null then assume match all when not-in is false
 	 (states-qry      (if (null? states) 
 			      #f
@@ -944,15 +943,17 @@
 	 (qry             (conc "SELECT " qryvals
 				" FROM tests WHERE run_id=? AND state != 'DELETED' "
 				states-statuses-qry
 				(if tests-match-qry (conc " AND (" tests-match-qry ") ") "")
 				(case sort-by
-				  ((rundir)     " ORDER BY length(rundir) DESC ")
-				  ((event_time) " ORDER BY event_time ASC ")
+				  ((rundir)     " ORDER BY length(rundir) ")
+				  ((testname)   " ORDER BY testname,item_path ")
+				  ((event_time) " ORDER BY event_time ")
 				  (else         (if (string? sort-by)
-						    (conc " ORDER BY " sort-by) 
+						    (conc " ORDER BY " sort-by)
 						    "")))
+				(if sort-order sort-order "")
 				(if limit  (conc " LIMIT " limit)   "")
 				(if offset (conc " OFFSET " offset) "")
 				";"
 				)))
     (debug:print-info 8 "db:get-tests-for-run qry=" qry)
@@ -961,11 +962,10 @@
        (set! res (cons (apply vector a b) res))) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment) res)))
      db 
      qry
      run-id
      )
-    (debug:print-info 11 "db:get-tests-for-run START run-id=" run-id ", testpatt=" testpatt ", states=" states ", statuses=" statuses ", not-in=" not-in ", sort-by=" sort-by)
     res))
 
 ;; get a useful subset of the tests data (used in dashboard
 ;; use db:mintests-get-{id ,run_id,testname ...}
 (define (db:get-tests-for-runs-mindata db run-ids testpatt states status not-in)
@@ -980,11 +980,10 @@
 ;; run-ids is a list of run-ids or a single number or #f for all runs
 (define (db:get-tests-for-runs db run-ids testpatt states statuses 
 			       #!key (not-in #t)
 			       (sort-by #f)
 			       (qryvals "id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment")) ;; 'rundir 'event_time
-  (debug:print-info 11 "db:get-tests-for-run START run-ids=" run-ids ", testpatt=" testpatt ", states=" states ", statuses=" statuses ", not-in=" not-in ", sort-by=" sort-by)
   (let* ((res '())
 	 ;; if states or statuses are null then assume match all when not-in is false
 	 (states-qry      (if (null? states) 
 			      #f
 			      (conc " state "  
@@ -1013,18 +1012,17 @@
 				(case sort-by
 				  ((rundir)     " ORDER BY length(rundir) DESC;")
 				  ((event_time) " ORDER BY event_time ASC;")
 				  (else         ";"))
 				)))
-    (debug:print-info 8 "db:get-tests-for-run qry=" qry)
+    (debug:print-info 8 "db:get-tests-for-runs qry=" qry)
     (sqlite3:for-each-row 
      (lambda (a . b) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment)
        (set! res (cons (apply vector a b) res))) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment) res)))
      db 
      qry
      )
-    (debug:print-info 11 "db:get-tests-for-run START run-ids=" run-ids ", testpatt=" testpatt ", states=" states ", statuses=" statuses ", not-in=" not-in ", sort-by=" sort-by)
     res))
 
 ;; this one is a bit broken BUG FIXME
 (define (db:delete-test-step-records db test-id #!key (work-area #f))
   ;; Breaking it into two queries for better file access interleaving

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -64,21 +64,21 @@
 
 ;;======================================================================
 ;;  T E S T S
 ;;======================================================================
 
-(define (mt:get-tests-for-run run-id testpatt states status #!key (not-in #t) (sort-by #f) (qryvals #f))
-  (let loop ((testsdat (cdb:remote-run db:get-tests-for-run #f run-id testpatt states status 0 500 not-in sort-by qryvals: qryvals))
+(define (mt:get-tests-for-run run-id testpatt states status #!key (not-in #t) (sort-by 'event_time) (sort-order "ASC") (qryvals #f))
+  (let loop ((testsdat (cdb:remote-run db:get-tests-for-run #f run-id testpatt states status 0 500 not-in sort-by sort-order qryvals: qryvals))
 	     (res      '())
 	     (offset   0)
 	     (limit    500))
     (let* ((full-list (append res testsdat))
 	   (have-more (eq? (length testsdat) limit)))
       (if have-more 
 	  (let ((new-offset (+ offset limit)))
 	    (debug:print-info 4 "More than " limit " tests, have " (length full-list) " tests so far.")
-	    (loop (cdb:remote-run db:get-tests-for-run #f run-id testpatt states status new-offset limit not-in sort-by qryvals: qryvals)
+	    (loop (cdb:remote-run db:get-tests-for-run #f run-id testpatt states status new-offset limit not-in sort-by sort-order qryvals: qryvals)
 		  full-list
 		  new-offset
 		  limit))
 	  full-list))))
 

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -157,11 +157,11 @@
 	  ;; if found then return that matching test record
 	  (debug:print 4 "selstr: " selstr ", qrystr: " qrystr ", keyvals: " keyvals ", previous run ids found: " prev-run-ids)
 	  (if (null? prev-run-ids) #f
 	      (let loop ((hed (car prev-run-ids))
 			 (tal (cdr prev-run-ids)))
-		(let ((results (db:get-tests-for-run db hed (conc test-name "/" item-path)'() '() #f #f #f #f)))
+		(let ((results (db:get-tests-for-run db hed (conc test-name "/" item-path)'() '() #f #f #f #f #f)))
 		  (debug:print 4 "Got tests for run-id " run-id ", test-name " test-name ", item-path " item-path ": " results)
 		  (if (and (null? results)
 			   (not (null? tal)))
 		      (loop (car tal)(cdr tal))
 		      (if (null? results) #f
@@ -198,11 +198,11 @@
 	  (debug:print 4 "selstr: " selstr ", qrystr: " qrystr ", keyvals: " keyvals 
 		       ", previous run ids found: " prev-run-ids)
 	  (if (null? prev-run-ids) '()  ;; no previous runs? return null
 	      (let loop ((hed (car prev-run-ids))
 			 (tal (cdr prev-run-ids)))
-		(let ((results (db:get-tests-for-run db hed (conc test-name "/" item-path) '() '() #f #f #f #f)))
+		(let ((results (db:get-tests-for-run db hed (conc test-name "/" item-path) '() '() #f #f #f #f #f)))
 		  (debug:print 4 "Got tests for run-id " run-id ", test-name " test-name 
 			       ", item-path " item-path " results: " (intersperse results "\n"))
 		  ;; Keep only the youngest of any test/item combination
 		  (for-each 
 		   (lambda (testdat)