Overview
| Comment: | Merged run removal fix |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65 |
| Files: | files | file ages | folders |
| SHA1: |
9ccc81e58bea96ef00e1fac961aade1f |
| User & Date: | mrwellan on 2020-11-02 15:20:17 |
| Other Links: | branch diff | manifest | tags |
Context
|
2020-11-02
| ||
| 17:04 | Merged archive fixes to v1.65 main. check-in: 7b3c883ad4 user: mrwellan tags: v1.65 | |
| 16:04 | Pulled adjutant branch forward Leaf check-in: 9833ab039e user: mrwellan tags: v1.65-adjutant-again | |
| 15:20 | Merged run removal fix check-in: 9ccc81e58b user: mrwellan tags: v1.65 | |
|
2020-11-01
| ||
| 22:35 | Added MT_STEP_NAMES, propagate rerun and setvars for subruns check-in: 49dabf8891 user: matt tags: v1.65 | |
|
2020-10-27
| ||
| 17:01 | enabled -remove-runs with % wildcards in the target Closed-Leaf check-in: 69da469153 user: mmgraham tags: 1.65-remove-runs-wildcard | |
Changes
Modified runs.scm from [23795c6b6f] to [7ac979c2cd].
| ︙ | ︙ | |||
2287 2288 2289 2290 2291 2292 2293 |
(path-out (conc "/" (string-intersperse (take dparts (- (length dparts) 1)) "/")))
)
path-out
)
)
| < < < < < < < < < < < < < < < < < < < | 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 |
(path-out (conc "/" (string-intersperse (take dparts (- (length dparts) 1)) "/")))
)
path-out
)
)
(define (runs:operate-on action target runnamepatt testpatt #!key (state #f)(status #f)(new-state-status #f)(mode #f)(options '()))
(common:clear-caches) ;; clear all caches
(let* ((db #f)
;; (tdbdat (tasks:open-db))
(keys (rmt:get-keys))
(rundat (mt:get-runs-by-patt keys runnamepatt target))
(header (vector-ref rundat 0))
|
| ︙ | ︙ | |||
2543 2544 2545 2546 2547 2548 2549 |
(loop new-test-dat tal)
(loop (car tal)(append tal (list new-test-dat)))))
(begin
(let ((rundir (db:test-get-rundir new-test-dat)))
(if (and (not (string= rundir "/tmp/badname"))
(file-exists? rundir)
(substring-index run-name rundir)
| | | > > | 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 |
(loop new-test-dat tal)
(loop (car tal)(append tal (list new-test-dat)))))
(begin
(let ((rundir (db:test-get-rundir new-test-dat)))
(if (and (not (string= rundir "/tmp/badname"))
(file-exists? rundir)
(substring-index run-name rundir)
(tests:glob-like-match (conc "%/" target "/%") rundir)
)
(begin
(set! lasttpath (db:test-get-rundir new-test-dat)) ;; remember this path for run removal
(set! lastrealpath (remove-last-path-directory (resolve-pathname lasttpath)))
(hash-table-set! run-paths-hash lastrealpath 1)
(runs:remove-test-directory new-test-dat mode) ;; 'remove-all)
)
(begin
(debug:print 2 *default-log-port* "Not removing directory " rundir " because either it doesn't exist or has a bad name")
(debug:print 2 *default-log-port* "Is /tmp/badname: " (string= rundir "/tmp/badname"))
(debug:print 2 *default-log-port* "Exists: " (file-exists? rundir))
(debug:print 2 *default-log-port* "Has run-name: " (substring-index run-name rundir))
(debug:print 2 *default-log-port* "Has target: " (tests:glob-like-match (conc "%/" target "/%") rundir))
(debug:print 2 *default-log-port* "Target: " target)
;;PJH remove record from db no need to cleanup directory
(case mode
((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) (db:test-get-state test)(db:test-get-status test) #f))
((archive-remove) (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVED" #f #f))
(else (rmt:delete-test-records (db:test-get-run_id test) (db:test-get-id test))))
)
|
| ︙ | ︙ |