Overview
| Comment: | Typo fix |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.64 |
| Files: | files | file ages | folders |
| SHA1: |
c5d3ea8ae6868c0b7b62c26edaffccd3 |
| User & Date: | mrwellan on 2017-08-08 10:28:15 |
| Other Links: | branch diff | manifest | tags |
Context
|
2017-08-08
| ||
| 13:36 | Adjusted date format to match TeamCity requirements check-in: ee77e3a1b4 user: mrwellan tags: v1.64 | |
| 10:28 | Typo fix check-in: c5d3ea8ae6 user: mrwellan tags: v1.64 | |
|
2017-08-07
| ||
| 23:03 | Merged teamcity changes into v1.64 check-in: ae54a2b85c user: matt tags: v1.64 | |
Changes
cgisetup/cgi-bin/models became a regular file with contents [39c07627cc].
cgisetup/cgi-bin/pages became a regular file with contents [e2b5ed002d].
Modified tcmt.scm from [243cf2565a] to [0a9f62fa41].
| ︙ | ︙ | |||
79 80 81 82 83 84 85 | (startp (testdat-start-printed tdat)) (endp (testdat-end-printed tdat)) (etime (testdat-event-time tdat)) (overall (case state ((RUNNING) state) ((COMPLETED) state) (else 'UNK))) | | | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 |
(startp (testdat-start-printed tdat))
(endp (testdat-end-printed tdat))
(etime (testdat-event-time tdat))
(overall (case state
((RUNNING) state)
((COMPLETED) state)
(else 'UNK)))
(tstmp (conc " timestamp='" (time->string (seconds->local-time etime) "%F %T") "'")))
(case overall
((RUNNING)
(if (not startp)
(begin
(print "##teamcity[testStarted " tcname flowid tstmp "]")
(testdat-start-printed-set! tdat #t))))
((COMPLETED)
|
| ︙ | ︙ | |||
103 104 105 106 107 108 109 |
(testdat-end-printed-set! tdat #t))))
(else
(if flush-mode
(begin
(if (not startp)
(begin
(print "##teamcity[testStarted " tcname flowid tstmp "]")
| | | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 |
(testdat-end-printed-set! tdat #t))))
(else
(if flush-mode
(begin
(if (not startp)
(begin
(print "##teamcity[testStarted " tcname flowid tstmp "]")
(testdat-start-printed-set! tdat #t)))
(if (not endp)
(begin
(print "##teamcity[testFailed " tcname flowid comment details "]")
(testdat-end-printed-set! tdat #t)))))))
;; (print "ERROR: tc-type \"" (testdat-tc-type tdat) "\" not recognised for " tcname)))
(flush-output)))
|
| ︙ | ︙ | |||
141 142 143 144 145 146 147 |
(let* ((print-time (- (current-seconds) age)) ;; print stuff over 15 seconds old
(tqueue-raw (hash-table-ref/default data 'tqueue '()))
(tqueue (reverse (delete-duplicates tqueue-raw ;; REMOVE duplicates by testname and state
(lambda (a b)
(and (equal? (testdat-tname a)(testdat-tname b)) ;; need oldest to newest
(equal? (testdat-state a) (testdat-state b)))))))) ;; "COMPLETED")
;; (equal? (testdat-state b) "COMPLETED")))))))
| | < | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 |
(let* ((print-time (- (current-seconds) age)) ;; print stuff over 15 seconds old
(tqueue-raw (hash-table-ref/default data 'tqueue '()))
(tqueue (reverse (delete-duplicates tqueue-raw ;; REMOVE duplicates by testname and state
(lambda (a b)
(and (equal? (testdat-tname a)(testdat-tname b)) ;; need oldest to newest
(equal? (testdat-state a) (testdat-state b)))))))) ;; "COMPLETED")
;; (equal? (testdat-state b) "COMPLETED")))))))
(if (not (null? tqueue))
(hash-table-set!
data
'tqueue
(let loop ((hed (car tqueue)) ;; by this point all duplicates by state COMPLETED are removed
(tal (cdr tqueue))
(rem '()))
(if (> print-time (testdat-event-time hed)) ;; event happened over 15 seconds ago
|
| ︙ | ︙ |