Overview
| Comment: | Fixed couple build issues |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | refactor-db |
| Files: | files | file ages | folders |
| SHA1: |
f329113f79bad4ca938df00e7e24d184 |
| User & Date: | matt on 2013-10-19 11:14:14 |
| Other Links: | branch diff | manifest | tags |
Context
|
2013-10-24
| ||
| 21:51 | Merged v1.55 to refactor-db check-in: 2842a76bf8 user: matt tags: refactor-db | |
|
2013-10-19
| ||
| 11:14 | Fixed couple build issues check-in: f329113f79 user: matt tags: refactor-db | |
| 10:36 | Merged refactor-api into refactor-db check-in: 45b4ad07c1 user: matt tags: refactor-db | |
Changes
Modified Makefile from [1f63ce6d9b] to [67719e5eb6].
1 2 3 4 5 6 7 8 9 10 11 |
# make install CSCOPTS='-accumulate-profile -profile-name $(PWD)/profile-ww$(shell date +%V.%u)'
PREFIX=$(PWD)
CSCOPTS=
INSTALL=install
SRCFILES = common.scm items.scm launch.scm \
ods.scm runconfig.scm server.scm configf.scm \
db.scm keys.scm margs.scm megatest-version.scm \
process.scm runs.scm tasks.scm tests.scm genexample.scm \
fs-transport.scm http-transport.scm \
client.scm gutils.scm synchash.scm daemon.scm mt.scm dcommon.scm \
tree.scm ezsteps.scm lock-queue.scm filedb.scm \
| | < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 |
# make install CSCOPTS='-accumulate-profile -profile-name $(PWD)/profile-ww$(shell date +%V.%u)'
PREFIX=$(PWD)
CSCOPTS=
INSTALL=install
SRCFILES = common.scm items.scm launch.scm \
ods.scm runconfig.scm server.scm configf.scm \
db.scm keys.scm margs.scm megatest-version.scm \
process.scm runs.scm tasks.scm tests.scm genexample.scm \
fs-transport.scm http-transport.scm \
client.scm gutils.scm synchash.scm daemon.scm mt.scm dcommon.scm \
tree.scm ezsteps.scm lock-queue.scm filedb.scm \
rmt.scm api.scm tdb.scm
GUISRCF = dashboard-tests.scm dashboard-guimonitor.scm
OFILES = $(SRCFILES:%.scm=%.o)
GOFILES = $(GUISRCF:%.scm=%.o)
ADTLSCR=mt_laststep mt_runstep mt_ezstep
|
| ︙ | ︙ |
Modified db.scm from [55102233b3] to [a48f254165].
| ︙ | ︙ | |||
984 985 986 987 988 989 990 |
((and newstate newstatus)
(sqlite3:execute db "UPDATE tests SET state=?,status=? WHERE id=?;" newstate newstatus test-id))
(else
(if newstate (sqlite3:execute db "UPDATE tests SET state=? WHERE id=?;" newstate test-id))
(if newstatus (sqlite3:execute db "UPDATE tests SET status=? WHERE id=?;" newstatus test-id))
(if newcomment (sqlite3:execute db "UPDATE tests SET comment=? WHERE id=?;" newcomment test-id))))
(db:process-triggers test-id newstate newstatus)
| | | 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 |
((and newstate newstatus)
(sqlite3:execute db "UPDATE tests SET state=?,status=? WHERE id=?;" newstate newstatus test-id))
(else
(if newstate (sqlite3:execute db "UPDATE tests SET state=? WHERE id=?;" newstate test-id))
(if newstatus (sqlite3:execute db "UPDATE tests SET status=? WHERE id=?;" newstatus test-id))
(if newcomment (sqlite3:execute db "UPDATE tests SET comment=? WHERE id=?;" newcomment test-id))))
(db:process-triggers test-id newstate newstatus)
#t)) ;; retrun something to keep the remote calls happy
;; Never used
;; (define (db:test-set-state-status-by-run-id-testname db run-id test-name item-path status state)
;; (sqlite3:execute db "UPDATE tests SET state=?,status=?,event_time=strftime('%s','now') WHERE run_id=? AND testname=? AND item_path=?;"
;; state status run-id test-name item-path))
;; NEW BEHAVIOR: Count tests running in only one run!
|
| ︙ | ︙ | |||
1836 1837 1838 1839 1840 1841 1842 | ;;====================================================================== (define (db:step-get-time-as-string vec) (seconds->time-string (db:step-get-event_time vec))) (define (db:get-steps-for-test dbstruct run-id test-id) (let ((res '())) | < > | | | 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 |
;;======================================================================
(define (db:step-get-time-as-string vec)
(seconds->time-string (db:step-get-event_time vec)))
(define (db:get-steps-for-test dbstruct run-id test-id)
(let ((res '()))
(sqlite3:for-each-row
(lambda (id test-id stepname state status event-time logfile)
(set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "")) res)))
(db:get-db dbstruct run-id)
"SELECT id,test_id,stepname,state,status,event_time,logfile_id FROM test_steps WHERE test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC;
test-id)
(reverse res)))
;;(define (db:get-steps-table dbstruct run-id test-id)
;; (let ((steps (db:get-steps-for-test dbstruct run-id test-id)))
;; ;; get a pretty table to summarize steps
;; ;;
;; (define (db:get-steps-table-list dbstruct run-id test-id #!key (work-area #f))
;; (let ((steps (db:get-steps-for-test dbstruct run-id test-id)))
;; ;; organise the steps for better readability
;; (let ((res (make-hash-table)))
;; (for-each
|
| ︙ | ︙ |