Overview
| Comment: | Handle toplevel with children tests better in archiving |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 | v1.6019 |
| Files: | files | file ages | folders |
| SHA1: |
efc02c437a8de5303a4751b6b855163b |
| User & Date: | mrwellan on 2015-07-08 08:21:26 |
| Other Links: | branch diff | manifest | tags |
Context
|
2015-07-08
| ||
| 14:39 | Added override of -testpatt with TESTPATT env var IIF -testpatt is set to % check-in: 1e25f1ec03 user: mrwellan tags: v1.60, v1.6019 | |
| 10:52 | Merged v1.60 into trunk check-in: 5e62539116 user: mrwellan tags: trunk | |
| 08:21 | Handle toplevel with children tests better in archiving check-in: efc02c437a user: mrwellan tags: v1.60, v1.6019 | |
|
2015-07-07
| ||
| 23:36 | Fixed ticket 5174514d73. Crash on bad use of -setvars check-in: ba09a8a79c user: matt tags: v1.60 | |
Changes
Modified archive.scm from [d53c0bfed5] to [1e200bee3b].
| ︙ | ︙ | |||
229 230 231 232 233 234 235 | (archive-block-id (db:test-get-archived test-dat)) (archive-block-info (rmt:test-get-archive-block-info archive-block-id)) (archive-path (if (vector? archive-block-info) (vector-ref archive-block-info 2) ;; look in db.scm for test-get-archive-block-info for the vector record info #f)) ;; no archive found? (archive-internal-path (conc (common:get-testsuite-name) "-" run-id "/latest/" test-partial-path))) | | > | | | > | 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 | (archive-block-id (db:test-get-archived test-dat)) (archive-block-info (rmt:test-get-archive-block-info archive-block-id)) (archive-path (if (vector? archive-block-info) (vector-ref archive-block-info 2) ;; look in db.scm for test-get-archive-block-info for the vector record info #f)) ;; no archive found? (archive-internal-path (conc (common:get-testsuite-name) "-" run-id "/latest/" test-partial-path))) ;; some sanity checks, move an existing path out of the way - iif it is not a toplevel with children ;; (if (and (not toplevel/children) ;; special handling needed for toplevel with children prev-test-physical-path (file-exists? prev-test-physical-path)) ;; what to do? abort or clean up or link it in? (let* ((base (pathname-directory prev-test-physical-path)) (dirn (pathname-file prev-test-physical-path)) (newn (conc base "/." dirn))) (debug:print 0 "ERROR: the old directory " prev-test-physical-path ", still exists! Moving it to " newn) (rename-file prev-test-physical-path newn))) (if (and archive-path ;; no point in proceeding if there is no actual archive (not toplevel/children)) (begin ;; CREATE WORK AREA ;; test-src-path == #f ==> don't copy in data from tests directory ;; itemdat == string ==> use directly (create-work-area run-id run-name keyvals test-id #f best-disk test-name item-path) ;; #!key (remtries 2)) ;; 1. Get the block id from the test info |
| ︙ | ︙ |