Index: db-test.sh ================================================================== --- db-test.sh +++ db-test.sh @@ -5,34 +5,45 @@ # perl -pi -e 's/db:test-set-final_logf!/db:test-final_logf-set!/g' *.scm # perl -pi -e 's/db:test-set-diskfree!/db:test-diskfree-set!/g' *.scm # perl -pi -e 's/db:test-set-cpuload!/db:test-cpuload-set!/g' *.scm # fix few special cases -perl -pi -e 's/db:test-get-rundir-from-test-id/dbx:test-get-rundir-from-test-id/g' *scm -perl -pi -e 's/db:test-get-is-toplevel/dbx:test-is-toplevel/g' *.scm - -perl -pi -e 's/db:test-uname/dbr:test-uname/g' *.scm -perl -pi -e 's/db:test-testname/dbr:test-testname/g' *.scm -perl -pi -e 's/db:test-status/dbr:test-status/g' *.scm -perl -pi -e 's/db:test-state/dbr:test-state/g' *.scm -perl -pi -e 's/db:test-rundir/dbr:test-rundir/g' *.scm -perl -pi -e 's/db:test-run_id/dbr:test-run_id/g' *.scm -perl -pi -e 's/db:test-run_duration/dbr:test-run_duration/g' *.scm -perl -pi -e 's/db:test-process_id/dbr:test-process_id/g' *.scm -perl -pi -e 's/db:test-pass_count/dbr:test-pass_count/g' *.scm -perl -pi -e 's/db:test-item-path/dbr:test-item-path/g' *.scm -perl -pi -e 's/db:test-id/dbr:test-id/g' *.scm -perl -pi -e 's/db:test-host/dbr:test-host/g' *.scm -perl -pi -e 's/db:test-fullname/dbr:test-fullname/g' *.scm -perl -pi -e 's/db:test-first_warn/dbr:test-first_warn/g' *.scm -perl -pi -e 's/db:test-first_err/dbr:test-first_err/g' *.scm -perl -pi -e 's/db:test-final_logf/dbr:test-final_logf/g' *.scm -perl -pi -e 's/db:test-fail_count/dbr:test-fail_count/g' *.scm -perl -pi -e 's/db:test-event_time/dbr:test-event_time/g' *.scm -perl -pi -e 's/db:test-diskfree/dbr:test-diskfree/g' *.scm -perl -pi -e 's/db:test-cpuload/dbr:test-cpuload/g' *.scm -perl -pi -e 's/db:test-comment/dbr:test-comment/g' *.scm -perl -pi -e 's/db:test-archived/dbr:test-archived/g' *.scm - -perl -pi -e 's/dbx:test-get-rundir-from-test-id/db:test-get-rundir-from-test-id/g' *scm -perl -pi -e 's/dbx:test-is-toplevel/db:test-is-toplevel/g' *.scm - +# perl -pi -e 's/db:test-get-rundir-from-test-id/dbx:test-get-rundir-from-test-id/g' *scm +# perl -pi -e 's/db:test-get-is-toplevel/dbx:test-is-toplevel/g' *.scm +# +# perl -pi -e 's/db:test-uname/dbr:test-uname/g' *.scm +# perl -pi -e 's/db:test-testname/dbr:test-testname/g' *.scm +# perl -pi -e 's/db:test-status/dbr:test-status/g' *.scm +# perl -pi -e 's/db:test-state/dbr:test-state/g' *.scm +# perl -pi -e 's/db:test-rundir/dbr:test-rundir/g' *.scm +# perl -pi -e 's/db:test-run_id/dbr:test-run_id/g' *.scm +# perl -pi -e 's/db:test-run_duration/dbr:test-run_duration/g' *.scm +# perl -pi -e 's/db:test-process_id/dbr:test-process_id/g' *.scm +# perl -pi -e 's/db:test-pass_count/dbr:test-pass_count/g' *.scm +# perl -pi -e 's/db:test-item-path/dbr:test-item-path/g' *.scm +# perl -pi -e 's/db:test-id/dbr:test-id/g' *.scm +# perl -pi -e 's/db:test-host/dbr:test-host/g' *.scm +# perl -pi -e 's/db:test-fullname/dbr:test-fullname/g' *.scm +# perl -pi -e 's/db:test-first_warn/dbr:test-first_warn/g' *.scm +# perl -pi -e 's/db:test-first_err/dbr:test-first_err/g' *.scm +# perl -pi -e 's/db:test-final_logf/dbr:test-final_logf/g' *.scm +# perl -pi -e 's/db:test-fail_count/dbr:test-fail_count/g' *.scm +# perl -pi -e 's/db:test-event_time/dbr:test-event_time/g' *.scm +# perl -pi -e 's/db:test-diskfree/dbr:test-diskfree/g' *.scm +# perl -pi -e 's/db:test-cpuload/dbr:test-cpuload/g' *.scm +# perl -pi -e 's/db:test-comment/dbr:test-comment/g' *.scm +# perl -pi -e 's/db:test-archived/dbr:test-archived/g' *.scm +# +# perl -pi -e 's/dbx:test-get-rundir-from-test-id/db:test-get-rundir-from-test-id/g' *scm +# perl -pi -e 's/dbx:test-is-toplevel/db:test-is-toplevel/g' *.scm +# + +# bash-3.00$ egrep 'db:mintest-(get|set)' db_records.scm|perl -pi -e 's/.*db:mintest-(\S*)(\s+.*|)$/perl -pi -e "s\/db:mintest-$1\/dbr:mintest-$1\/g *.scm"/'|sort -ur + +bash-3.00$ egrep 'db:mintest-(get|set)' db_records.scm|perl -pi -e 's/.*db:mintest-(\S*)(\s+.*|)$/perl -pi -e "s\/db:mintest-$1\/dbr:mintest-$1\/g" *.scm/'|sort -ur +perl -pi -e "s/db:mintest-get-testname/dbr:mintest-get-testname/g" *.scm +perl -pi -e "s/db:mintest-get-status/dbr:mintest-get-status/g" *.scm +perl -pi -e "s/db:mintest-get-state/dbr:mintest-get-state/g" *.scm +perl -pi -e "s/db:mintest-get-run_id/dbr:mintest-get-run_id/g" *.scm +perl -pi -e "s/db:mintest-get-item_path/dbr:mintest-get-item_path/g" *.scm +perl -pi -e "s/db:mintest-get-id/dbr:mintest-get-id/g" *.scm +perl -pi -e "s/db:mintest-get-event_time/dbr:mintest-get-event_time/g" *.scm Index: db_records.scm ================================================================== --- db_records.scm +++ db_records.scm @@ -115,17 +115,17 @@ (equal? (dbr:test-uname vec) "n/a"))) ;; test has never been run ;; make-vector-record "" db mintest id run_id testname state status event_time item_path ;; (define (make-db:mintest)(make-vector 7)) -(define-inline (db:mintest-get-id vec) (vector-ref vec 0)) -(define-inline (db:mintest-get-run_id vec) (vector-ref vec 1)) -(define-inline (db:mintest-get-testname vec) (vector-ref vec 2)) -(define-inline (db:mintest-get-state vec) (vector-ref vec 3)) -(define-inline (db:mintest-get-status vec) (vector-ref vec 4)) -(define-inline (db:mintest-get-event_time vec) (vector-ref vec 5)) -(define-inline (db:mintest-get-item_path vec) (vector-ref vec 6)) +(define-inline (dbr:mintest-id vec) (vector-ref vec 0)) +(define-inline (dbr:mintest-run_id vec) (vector-ref vec 1)) +(define-inline (dbr:mintest-testname vec) (vector-ref vec 2)) +(define-inline (dbr:mintest-state vec) (vector-ref vec 3)) +(define-inline (dbr:mintest-status vec) (vector-ref vec 4)) +(define-inline (dbr:mintest-event_time vec) (vector-ref vec 5)) +(define-inline (dbr:mintest-item_path vec) (vector-ref vec 6)) ;; make-vector-record db testmeta id testname author owner description reviewed iterated avg_runtime avg_disk (define (make-db:testmeta)(make-vector 10 "")) (define-inline (db:testmeta-get-id vec) (vector-ref vec 0)) (define-inline (db:testmeta-get-testname vec) (vector-ref vec 1)) Index: dcommon.scm ================================================================== --- dcommon.scm +++ dcommon.scm @@ -210,21 +210,21 @@ (let* ((run-path (hash-table-ref (dboard:data-get-run-keys *data*) run-id)) (test-changes (hash-table-ref all-test-changes run-id)) (new-test-dat (car test-changes)) (removed-tests (cadr test-changes)) (tests (sort (map cadr (filter (lambda (testrec) - (eq? run-id (db:mintest-get-run_id (cadr testrec)))) + (eq? run-id (dbr:mintest-run_id (cadr testrec)))) new-test-dat)) (lambda (a b) - (let ((time-a (db:mintest-get-event_time a)) - (time-b (db:mintest-get-event_time b))) + (let ((time-a (dbr:mintest-event_time a)) + (time-b (dbr:mintest-event_time b))) (> time-a time-b))))) ;; test-changes is a list of (( id record ) ... ) ;; Get list of test names sorted by time, remove tests (test-names (delete-duplicates (map (lambda (t) - (let ((i (db:mintest-get-item_path t)) - (n (db:mintest-get-testname t))) + (let ((i (dbr:mintest-item_path t)) + (n (dbr:mintest-testname t))) (if (string=? i "") (conc " " i) n))) tests))) (colnum (car (hash-table-ref runid-to-col run-id)))) @@ -233,15 +233,15 @@ ;; run view panel? The run view panel can have a tree selector for ;; browsing the tests/items ;; SWITCH THIS TO USING CHANGED TESTS ONLY (for-each (lambda (test) - (let* ((test-id (db:mintest-get-id test)) - (state (db:mintest-get-state test)) - (status (db:mintest-get-status test)) - (testname (db:mintest-get-testname test)) - (itempath (db:mintest-get-item_path test)) + (let* ((test-id (dbr:mintest-id test)) + (state (dbr:mintest-state test)) + (status (dbr:mintest-status test)) + (testname (dbr:mintest-testname test)) + (itempath (dbr:mintest-item_path test)) (fullname (conc testname "/" itempath)) (dispname (if (string=? itempath "") testname (conc " " itempath))) (rownum (hash-table-ref/default testname-to-row fullname #f)) (test-path (append run-path (if (equal? itempath "") (list testname) Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -1437,11 +1437,11 @@ (configf:lookup test-conf "skip" "rundelay")) ;; run-ids = #f means *all* runs (let* ((numseconds (common:hms-string->seconds (configf:lookup test-conf "skip" "rundelay"))) (running-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED") '() #f)) (completed-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("COMPLETED" "INCOMPLETE") '("PASS" "FAIL" "ABORT") #f)) ;; ironically INCOMPLETE is same as COMPLETED in this contex - (last-run-times (map db:mintest-get-event_time completed-tests)) + (last-run-times (map dbr:mintest-event_time completed-tests)) (time-since-last (- (current-seconds) (if (null? last-run-times) 0 (apply max last-run-times))))) (if (or (not (null? running-tests)) ;; have to skip if test is running (> numseconds time-since-last)) (set! skip-test (conc "Skipping due to previous test run less than " (configf:lookup test-conf "skip" "rundelay") " ago"))))))