Index: gentargets.sh ================================================================== --- gentargets.sh +++ gentargets.sh @@ -15,9 +15,9 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with Megatest. If not, see . -echo '[v1.63/tip/dev]' +echo '[all/v1.65/tip/dev]' echo 'x 1' -echo '[v1.64/tip/dev]' +echo '[all/v1.64/tip/dev]' echo 'x 1' Index: mtut.scm ================================================================== --- mtut.scm +++ mtut.scm @@ -147,11 +147,11 @@ archive : compress and move test data to archive disk kill : stop tests or entire runs db : database utilities Queries: - areas, contours, setup : show areas, contours or setup section from megatest.config + show [areas|contours... ] : show areas, contours or other section from megatest.config gendot : generate a graphviz dot file from pkts. Contour actions: process : runs import, rungen and dispatch Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -2182,26 +2182,26 @@ (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds)) (let ((subrun-remove-succeeded (hash-table-ref/default backgrounded-remove-result test-fulln 'exception))) (cond ((eq? subrun-remove-succeeded 'exception) (let* ((logfile (subrun:get-log-path run-dir "remove"))) - (debug:print 0 *default-log-port* "ERROR: removing subrun of of " test-fulln " with run-id " run-id " ; see logfile @ "logfile))) - (subrun-remove-succeeded - (debug:print 0 *default-log-port* "Now removing of " test-fulln " with run-id " run-id " since subrun was removed.") - ;;(runs:remove-test-directory new-test-dat mode) ;; let normal case handle this. it will go thru loop again as non-subrun - ) - (else - (let* ((logfile (subrun:get-log-path run-dir "remove"))) - (debug:print 0 *default-log-port* "WARNING: removal of subrun failed. Please check "logfile" for details.")))) - ;;(if (not (null? tal)) - ;; (loop (car tal)(cdr tal))) - - ;; send to back of line, loop (will not match has-subrun next time through) - (let ((newtal (append tal (list test)))) - (loop (car newtal)(cdr newtal))) - )) - ) ; end case rem-status + (debug:print 0 *default-log-port* "ERROR: removing subrun of of " test-fulln " with run-id " run-id " ; see logfile @ "logfile)) + (if (not (null? tal)) + (loop (car tal)(cdr tal)))) + (subrun-remove-succeeded + (debug:print 0 *default-log-port* "Now removing of " test-fulln " with run-id " run-id " since subrun was removed.") + ;;(runs:remove-test-directory new-test-dat mode) ;; let normal case handle this. it will go thru loop again as non-subrun + (let ((newtal (append tal (list test)))) + (loop (car newtal)(cdr newtal)))) + (else + (let* ((logfile (subrun:get-log-path run-dir "remove"))) + (debug:print 0 *default-log-port* "WARNING: removal of subrun failed. Please check "logfile" for details.")) + ;; send to back of line, loop (will not match has-subrun next time through) + (if (not (null? tal)) + (loop (car tal)(cdr tal)))))) + ) + ) ; end case rem-status ) ; end let ); end cond has-subrun (else ;; BB - TODO - consider backgrounding to threads to delete tests (work below)