Overview
| Comment: | Fixed -dest to lock to correct location |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.65-broken |
| Files: | files | file ages | folders |
| SHA1: |
0364beb9c92e54e3e658cdf1876d7c75 |
| User & Date: | mrwellan on 2020-04-27 18:23:50 |
| Other Links: | branch diff | manifest | tags |
Context
|
2020-04-27
| ||
| 18:31 | Merged Makefile fix from newview branch check-in: 15b59cfa42 user: mrwellan tags: v1.6546, v1.65-broken | |
| 18:23 | Fixed -dest to lock to correct location check-in: 0364beb9c9 user: mrwellan tags: v1.65-broken | |
| 17:46 | Archive get now works well check-in: 0645166f9c user: mrwellan tags: v1.65-broken | |
Changes
Modified archive.scm from [a68821a111] to [80337cecee].
| ︙ | ︙ | |||
444 445 446 447 448 449 450 | (archive-internal-path (conc (common:get-testsuite-name) "-" run-id "/latest/" test-partial-path))) (if (and archive-path ;; no point in proceeding if there is no actual archive (not toplevel/children)) (begin (let* ((bup-restore-params (list "-d" archive-path "restore" "-C" (or destpath "data") | | | 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 | (archive-internal-path (conc (common:get-testsuite-name) "-" run-id "/latest/" test-partial-path))) (if (and archive-path ;; no point in proceeding if there is no actual archive (not toplevel/children)) (begin (let* ((bup-restore-params (list "-d" archive-path "restore" "-C" (or destpath "data") ;; " " ;; What is the empty string for? archive-internal-path))) (debug:print-info 0 *default-log-port* "Restoring archived data to " (or destpath "data") " from archive in " archive-path " ... " archive-internal-path) (run-n-wait bup-exe params: bup-restore-params print-cmd: #t))) (let ((new-rem-tests (filter (lambda (tdat) (or (not (eq? (db:test-get-id tdat) test-id)) (not (eq? (db:test-get-run_id tdat) run-id)))) |
| ︙ | ︙ |
Modified megatest.scm from [cd4b9c8593] to [1919b7031a].
| ︙ | ︙ | |||
1066 1067 1068 1069 1070 1071 1072 | (args:get-arg "-runname"))) ;; eventually get rid of the get-arg calls (testpatt (or (args:get-arg "-testpatt") (and (eq? action 'archive) ;; if it is an archive command fallback to MT_TEST_NAME and MT_ITEMPATH (common:get-full-test-name)) (and (eq? action 'kill-runs) "%/%") ;; I'm just guessing that this is correct :( (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt"))) | | | 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 |
(args:get-arg "-runname"))) ;; eventually get rid of the get-arg calls
(testpatt (or (args:get-arg "-testpatt")
(and (eq? action 'archive) ;; if it is an archive command fallback to MT_TEST_NAME and MT_ITEMPATH
(common:get-full-test-name))
(and (eq? action 'kill-runs)
"%/%") ;; I'm just guessing that this is correct :(
(common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")))
))) ;;
(cond
((not target)
(debug:print-error 0 *default-log-port* "Missing required parameter for "
action ", you must specify -target or -reqtarg")
(exit 1))
((not runname)
(debug:print-error 0 *default-log-port* "Missing required parameter for "
|
| ︙ | ︙ | |||
1889 1890 1891 1892 1893 1894 1895 |
;;======================================================================
;; Archive tests
;;======================================================================
;; Archive tests matching target, runname, and testpatt
(if (args:get-arg "-archive")
;; else do a general-run-call
| > > > > > > > | | | | | | 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 |
;;======================================================================
;; Archive tests
;;======================================================================
;; Archive tests matching target, runname, and testpatt
(if (args:get-arg "-archive")
;; else do a general-run-call
(begin
;; for the archive get we need to preserve the starting dir as part of the target path
(if (and (args:get-arg "-dest")
(not (equal? (substring (args:get-arg "-dest") 0 1) "/")))
(let ((newpath (conc (current-directory) "/" (args:get-arg "-dest"))))
(debug:print-info 1 *default-log-port* "Preserving original path to destination, was " (args:get-arg "-dest") ", now " newpath)
(hash-table-set! args:arg-hash "-dest" newpath)))
(general-run-call
"-archive"
"Archive"
(lambda (target runname keys keyvals)
(operate-on 'archive target-in: target runname-in: runname )))))
;;======================================================================
;; Extract a spreadsheet from the runs database
;;======================================================================
(if (args:get-arg "-extract-ods")
(general-run-call
|
| ︙ | ︙ |