Overview
| Comment: | Minor clean up from merge |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
f6a4f7080e4e9b3fdfd8e5535bf44c4e |
| User & Date: | matt on 2011-09-12 07:22:52 |
| Other Links: | manifest | tags |
Context
|
2011-09-12
| ||
| 19:58 | Cleaned up tests dashboard. check-in: d90aea75ce user: mrwellan tags: trunk | |
| 07:22 | Minor clean up from merge check-in: f6a4f7080e user: matt tags: trunk | |
| 07:04 | Merged in rollup branch check-in: 7a69e38634 user: matt tags: trunk | |
Changes
Modified dashboard-tests.scm from [f142c4ac47] to [d136c6edce].
| ︙ | ︙ | |||
357 358 359 360 361 362 363 | (iup:textbox #:action (lambda (obj char val) #f) #:expand "YES" #:multiline "YES" #:font "Courier New, -10"))) (hash-table-set! widgets "Test Steps" (lambda (testdat) (let* ((currval (iup:attribute stepsdat "VALUE")) ;; "TITLE")) | | | | | 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 | (iup:textbox #:action (lambda (obj char val) #f) #:expand "YES" #:multiline "YES" #:font "Courier New, -10"))) (hash-table-set! widgets "Test Steps" (lambda (testdat) (let* ((currval (iup:attribute stepsdat "VALUE")) ;; "TITLE")) (fmtstr "~25a~10a~10a~15a~15a") (comprsteps (db:get-steps-table db test-id)) (newval (string-intersperse (append (list (format #f fmtstr "Stepname" "Start" "End" "Status" "Time") (format #f fmtstr "========" "=====" "======" "======" "==========")) (map (lambda (x) ;; take advantage of the \n on time->string (format #f fmtstr (vector-ref x 0) (let ((s (vector-ref x 1))) (if (number? s)(seconds->time-string s) s)) (let ((s (vector-ref x 2))) (if (number? s)(seconds->time-string s) s)) (vector-ref x 3) ;; status (vector-ref x 4))) ;; time delta (sort (hash-table-values comprsteps) (lambda (a b) (if (and (number? a)(number? b)) (< (vector-ref a 1)(vector-ref b 1)) #t))))) "\n"))) (if (not (equal? currval newval)) |
| ︙ | ︙ |
Modified db.scm from [10f6820556] to [6ac1329f07].
| ︙ | ︙ | |||
646 647 648 649 650 651 652 653 654 655 656 657 658 659 |
;;
(define (make-db:steps-table)(make-vector 5))
(define-inline (db:steps-table-get-stepname vec) (vector-ref vec 0))
(define-inline (db:steps-table-get-start vec) (vector-ref vec 1))
(define-inline (db:steps-table-get-end vec) (vector-ref vec 2))
(define-inline (db:steps-table-get-status vec) (vector-ref vec 3))
(define-inline (db:steps-table-get-runtime vec) (vector-ref vec 4))
;; get a pretty table to summarize steps
;;
(define (db:get-steps-table db test-id)
(let ((steps (db:get-steps-for-test db test-id)))
;; organise the steps for better readability
(let ((res (make-hash-table)))
| > > > > > > | 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 |
;;
(define (make-db:steps-table)(make-vector 5))
(define-inline (db:steps-table-get-stepname vec) (vector-ref vec 0))
(define-inline (db:steps-table-get-start vec) (vector-ref vec 1))
(define-inline (db:steps-table-get-end vec) (vector-ref vec 2))
(define-inline (db:steps-table-get-status vec) (vector-ref vec 3))
(define-inline (db:steps-table-get-runtime vec) (vector-ref vec 4))
(define-inline (db:step-stable-set-stepname! vec val)(vector-set! vec 0 val))
(define-inline (db:step-stable-set-start! vec val)(vector-set! vec 1 val))
(define-inline (db:step-stable-set-end! vec val)(vector-set! vec 2 val))
(define-inline (db:step-stable-set-status! vec val)(vector-set! vec 3 val))
(define-inline (db:step-stable-set-runtime! vec val)(vector-set! vec 4 val))
;; get a pretty table to summarize steps
;;
(define (db:get-steps-table db test-id)
(let ((steps (db:get-steps-for-test db test-id)))
;; organise the steps for better readability
(let ((res (make-hash-table)))
|
| ︙ | ︙ |
Modified tests/tests/sqlitespeed/runscript.rb from [48430c30e3] to [4107e1724c].
| ︙ | ︙ | |||
25 26 27 28 29 30 31 |
puts "i=#{i}"
end
if status==0
status='pass'
else
status='fail'
end
| < | 25 26 27 28 29 30 31 32 33 34 35 36 37 |
puts "i=#{i}"
end
if status==0
status='pass'
else
status='fail'
end
record_step("add #{num_records}","end",status)
|