@@ -183,10 +183,12 @@
                             from standard in. Each line is comma delimited with four
                             fields category,variable,value,comment
 
 Queries
   -list-runs patt         : list runs matching pattern \"patt\", % is the wildcard
+  -fields fieldspec       : fields to include in json dump; runs:id,runame+tests:testname+steps
+  -dumpmode MODE          : dump in MODE format instead of sexpr, MODE=json,ini,sexp etc. (add -debug 0,9 to see which file contributes each line)
   -show-keys              : show the keys used in this megatest setup
   -test-files targpatt    : get the most recent test path/file matching targpatt e.g. %/% or '*.log'
                             returns list sorted by age ascending, see examples below
   -test-paths             : get the test paths matching target, runname, item and test
                             patterns.
@@ -193,16 +195,14 @@
   -list-disks             : list the disks available for storing runs
   -list-targets           : list the targets in runconfigs.config
   -list-db-targets        : list the target combinations used in the db
   -show-config            : dump the internal representation of the megatest.config file
   -show-runconfig         : dump the internal representation of the runconfigs.config file
-  -dumpmode MODE          : dump in MODE format instead of sexpr, MODE=json,ini,sexp etc. (add -debug 0,9 to see which file contributes each line)
   -show-cmdinfo           : dump the command info for a test (run in test environment)
   -section sectionName
   -var varName            : for config and runconfig lookup value for sectionName varName
   -since N                : get list of runs changed since time N (Unix seconds)
-  -fields fieldspec       : fields to include in json dump; runs:id,runame+tests:testname+steps
   -sort fieldname         : in -list-runs sort tests by this field
   -testdata-csv [categorypatt/]varpatt  : dump testdata for given category
 
 Misc 
   -start-dir path         : switch to this directory before running megatest
@@ -254,10 +254,11 @@
                             -run-patt <patt> -target-patt <patt> -dumpmode <csv,json,plain-text>
   -list-test-time	  : list time requered to complete each test in a run. It following following arguments
                             -runname <patt> -target <patt> -dumpmode <csv,json,plain-text>
   -syscheck               : do some very basic checks; write access and space in tmp, home, runs, links and 
                             is $DISPLAY valid 
+  -list-waivers           : dump waivers for specified target, runname, testpatt to stdout
 
 Diff report
   -diff-rep               : generate diff report (must include -src-target, -src-runname, -target, -runname
                                                   and either -diff-email or -diff-html)
   -src-target <target>
@@ -325,10 +326,11 @@
 			":variable"
 			":value"
 			":expected"
 			":tol"
 			":units"
+
 			;; misc
 			"-start-dir"
                         "-run-patt"
                         "-target-patt"   
 			"-contour"
@@ -387,10 +389,11 @@
                         "-diff-email"
 			"-sync-to"			
 			"-pgsync"
 			"-kill-wait"    ;; wait this long before removing test (default is 10 sec)
                         "-diff-html"
+
 			)
  		 (list  "-h" "-help" "--help"
 			"-manual"
 			"-version"
 		        "-force"
@@ -434,10 +437,11 @@
 			"-list-db-targets"
 			"-show-runconfig"
 			"-show-config"
 			"-show-cmdinfo"
 			"-get-run-status"
+			"-list-waivers"
 
 			;; queries
 			"-test-paths" ;; get path(s) to a test, ordered by youngest first
 
 			"-runall"    ;; run all tests, respects -testpatt, defaults to %
@@ -1691,20 +1695,50 @@
           (set! *time-to-exit* #t)
           ) ;; end if true branch (end of a let)
         ) ;; end if
     ) ;; end if -list-runs
 
-;; Don't think I need this. Incorporated into -list-runs instead
-;;
-;; (if (and (args:get-arg "-since")
-;; 	 (launch:setup))
-;;     (let* ((since-time (string->number (args:get-arg "-since")))
-;; 	   (run-ids    (db:get-changed-run-ids since-time)))
-;;       ;; (rmt:get-tests-for-runs-mindata run-ids testpatt states status not-in)
-;;       (print (sort run-ids <))
-;;       (set! *didsomething* #t)))
-      
+;; list-waivers
+(if (and (args:get-arg "-list-waivers")
+	 (launch:setup))
+    (let* ((runpatt     (or (args:get-arg "-runname") "%"))
+	   (testpatt    (common:args-get-testpatt #f))
+	   (keys        (rmt:get-keys)) 
+	   (runsdat     (rmt:get-runs-by-patt
+			 keys runpatt 
+			 (common:args-get-target) #f #f
+			 '("id" "runname" "state" "status" "owner" "event_time" "comment") 0))
+	   (runs        (db:get-rows runsdat))
+	   (header      (db:get-header runsdat))
+	   (results     (make-hash-table))  ;; [target] ( (testname/itempath . "comment") ... )
+	   (addtest     (lambda (target testname itempath comment)
+			  (hash-table-set! results target (cons (cons (conc testname "/" itempath) comment)
+								(hash-table-ref/default results target '())))))
+	   (last-target #f))
+      (for-each
+       (lambda (run)
+	 (let* ((run-id  (db:get-value-by-header run header "id"))
+		(target  (rmt:get-target run-id))
+		(runname (db:get-value-by-header run header "runname")) 
+		(tests   (rmt:get-tests-for-run
+			  run-id testpatt '("COMPLETED") '("WAIVED") #f #f #f 'testname 'asc							     ;; use qryvals if test-spec provided
+			  #f #f #f)))
+	   (if (not (equal? target last-target))
+	       (print "[" target "]"))
+	   (set! last-target target)
+	   (print "# " runname)
+	   (for-each
+	    (lambda (testdat)
+	      (let* ((testfullname (conc (db:test-get-testname testdat)
+					 (if (equal? "" (db:test-get-item-path testdat))
+					     ""
+					     (conc "/" (db:test-get-item-path testdat)))
+					 )))
+	      (print testfullname " " (db:test-get-comment testdat))))
+	    tests)))
+       runs)
+      (set! *didsomething* #t)))
       
 ;;======================================================================
 ;; full run
 ;;======================================================================