Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -115,10 +115,11 @@
   -run-wait               : wait on run specified by target and runname
   -preclean               : remove the existing test directory before running the test
   -clean-cache            : remove the cached megatest.config and runconfigs.config files
   -no-cache               : do not use the cached config files. 
   -one-pass               : launch as many tests as you can but do not wait for more to be ready
+  -remove-keep N action   : remove all but N most recent runs per target, action is; print,remove
 
 Selectors (e.g. use for -runtests, -remove-runs, -set-state-status, -list-runs etc.)
   -target key1/key2/...   : run for key1, key2, etc.
   -reqtarg key1/key2/...  : run for key1, key2, etc. but key1/key2 must be in runconfigs
   -testpatt patt1/patt2,patt3/...  : % is wildcard
@@ -290,10 +291,13 @@
 			"-env2file"
 			"-envcap"
 			"-envdelta"
 			"-setvars"
 			"-set-state-status"
+
+                        ;; move runs stuff here
+                        "-remove-keep"           
 			"-set-run-status"
 			"-debug" ;; for *verbosity* > 2
 			"-create-test"
 			"-override-timeout"
 			"-test-files"  ;; -test-paths is for listing all
@@ -1033,10 +1037,21 @@
      (lambda (target runname keys keyvals)
        (operate-on 'remove-runs mode: (if (args:get-arg "-keep-records")
                                           'remove-data-only
                                           'remove-all)))))
 
+(if (args:get-arg "-remove-keep")
+    (general-run-call 
+     "-remove-keep"
+     "remove keep"
+     (lambda (target runname keys keyvals)
+       (let ((actions (map string->symbol
+                           (if (null? remargs)
+                               '("print") ;; default to printing the output
+                               (string-split (car remargs) ",")))))
+         (runs:remove-all-but-last-n-runs-per-target target runname (string->number (args:get-arg "-remove-keep" actions: actions)))))))
+    
 (if (args:get-arg "-set-state-status")
     (general-run-call 
      "-set-state-status"
      "set state and status"
      (lambda (target runname keys keyvals)

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -1776,24 +1776,58 @@
 	      (hash-table-set! res-ht target (cons run (hash-table-ref/default res-ht target '())))))
 	  runs)))
      targets)
     res-ht))
 
-(define (runs:get-all-but-most-recent-n-per-target target-patts runpatt num-to-keep)
+;; delete runs older than X (weeks, days, months years etc.)
+;; delete redundant runs within a target - N is the input
+;; delete redundant runs within a target IFF older than given date/time AND keep at least N
+;; 
+(define (runs:remove-all-but-last-n-runs-per-target target-patts runpatt num-to-keep #!key (actions '(print)))
   (let ((runs-ht (runs:get-hash-by-target target-patts runpatt)))
     (for-each
      (lambda (target)
        (let* ((runs      (hash-table-ref runs-ht target))
 	      (sorted    (sort runs (lambda (a b)(> (simple-run-event_time a)(simple-run-event_time b)))))
-	      (to-remove (if (> (length sorted) num-to-keep)
-			     (take sorted (- (length sorted) num-to-keep))
-			     '())))
+	      (to-remove (let* ((len      (length sorted))
+                                (trim-amt (- len num-to-keep)))
+                           (if (> trim-amt 0)
+                               (take sorted trim-amt)
+                               '()))))
 	 (hash-table-set! runs-ht target to-remove)
-	 (print "Sorted: " (map simple-run-event_time sorted))
-	 (print "Remove: " (map simple-run-event_time to-remove))))
+         (print target ":")
+         (for-each
+          (lambda (run)
+            (let ((remove (member run to-remove (lambda (a b)
+                                                  (eq? (simple-run-id a)
+                                                       (simple-run-id b))))))
+              (for-each
+               (lambda (action)
+                 (case action
+                   ((print)
+                    (print " " (simple-run-runname run)
+                           " " (time->string (seconds->local-time (simple-run-event_time run)) "WW%V.%u %H:%M:%S")
+                           " " (if remove "REMOVE" "")))
+                   ((remove)
+                    (print "megatest -remove-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"))))
+               actions)))
+          sorted)))
+	 ;; (print "Sorted: " (map simple-run-event_time sorted))
+	 ;; (print "Remove: " (map simple-run-event_time to-remove))))
      (hash-table-keys runs-ht))
     runs-ht))
+
+;; (define (runs:remove-all-but-last-n-runs-per-target target-patts runpatt num-to-keep)
+;;   (let ((data (runs:get-all-but-most-recent-n-per-target target-patts runpatt num-to-keep)))
+;;     (for-each
+;;      (lambda (target)
+;;        (let ((runs-to-remove (hash-table-ref data target )))
+;;          (for-each
+;;           (lambda (run)
+;;             (print "megatest -remove-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"))
+;;           runs-to-remove)))
+;;      (hash-table-keys data))))
 
 ;; Remove runs
 ;; fields are passing in through 
 ;; action:
 ;;    'remove-runs