Changes In Branch fixup Through [ab830bcc7c] Excluding Merge-Ins
This is equivalent to a diff from 7a84f9fe01 to ab830bcc7c
2011-10-01
| ||
19:32 | Makefile fixes for install, added run and clean test management to dashboard. Fixed test sorting in dashboard. Only add path to megatest if specified in megatest.config. Misc other fixes. check-in: d9ed52b665 user: matt tags: trunk | |
2011-09-28
| ||
11:18 | Fixed sorting on buttons in dashboard check-in: d4ffcebff2 user: mrwellan tags: fixup (unpublished) | |
10:10 | Fixed bug check-in: ab830bcc7c user: mrwellan tags: fixup (unpublished) | |
2011-09-26
| ||
11:22 | Fixed up Makefile to install mt_ files in PREFIX check-in: f2ad9ca9c4 user: mrwellan tags: fixup (unpublished) | |
00:56 | Added -keepgoing to default run command in dashboard-test.scm check-in: 7a84f9fe01 user: matt tags: trunk | |
00:11 | Added install of mt_* scripts check-in: cd3d02e58e user: matt tags: trunk | |
Modified Makefile from [9de48ecb2b] to [42bf34d826].
|
| | > > | > | > | > > | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | PREFIX=. FILES=$(shell ls *.scm) HELPERS=$(addprefix $(PREFIX)/bin/,mt_laststep mt_runstep) megatest: $(FILES) csc megatest.scm dashboard: $(FILES) csc dashboard.scm $(PREFIX)/bin/megatest : megatest @echo Installing to PREFIX=$(PREFIX), use ^C to cancel and change sleep 2 cp megatest $(PREFIX)/bin/megatest $(HELPERS) : utils/mt_* cp $< $@ chmod a+x $@ # install dashboard as dboard so wrapper script can be called dashboard $(PREFIX)/bin/dboard : dashboard $(FILES) cp dashboard $(PREFIX)/bin/dboard utils/mk_dashboard_wrapper $(PREFIX) > $(PREFIX)/bin/dashboard chmod a+x $(PREFIX)/bin/dashboard install : $(PREFIX)/bin/megatest $(PREFIX)/bin/dboard $(PREFIX)/bin/dashboard $(HELPERS) test: tests/tests.scm cd tests;csi -I .. -b -n tests.scm |
Modified dashboard-tests.scm from [664f2af223] to [73e81be525].
︙ | ︙ | |||
185 186 187 188 189 190 191 | (set! newcomment b)) #:value (db:test-get-comment testdat) #:expand "YES")) (apply iup:hbox (iup:label "STATE:" #:size "30x") (let* ((btns (map (lambda (state) (let ((btn (iup:button state | | | | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 | (set! newcomment b)) #:value (db:test-get-comment testdat) #:expand "YES")) (apply iup:hbox (iup:label "STATE:" #:size "30x") (let* ((btns (map (lambda (state) (let ((btn (iup:button state #:expand "YES" #:size "50x" #:font "Courier New, -10" #:action (lambda (x) (db:test-set-state-status-by-id *db* test-id state #f #f) (db:test-set-state! testdat state))))) btn)) (list "COMPLETED" "NOT_STARTED" "RUNNING" "REMOTEHOSTSTART" "KILLED" "KILLREQ")))) (vector-set! *state-status* 0 (lambda (state color) (for-each (lambda (btn) (let* ((name (iup:attribute btn "TITLE")) (newcolor (if (equal? name state) color "192 192 192"))) (if (not (colors-similar? newcolor (iup:attribute btn "BGCOLOR"))) (iup:attribute-set! btn "BGCOLOR" newcolor)))) btns))) btns)) (apply iup:hbox (iup:label "STATUS:" #:size "30x") (let* ((btns (map (lambda (status) (let ((btn (iup:button status #:expand "YES" #:size "50x" #:font "Courier New, -10" #:action (lambda (x) (db:test-set-state-status-by-id *db* test-id #f status #f) (db:test-set-status! testdat status))))) btn)) (list "PASS" "WARN" "FAIL" "CHECK" "n/a" "WAIVED")))) (vector-set! *state-status* 1 (lambda (status color) |
︙ | ︙ | |||
344 345 346 347 348 349 350 | (test-info-panel testdat store-label widgets) (test-meta-panel testmeta store-meta)) (host-info-panel testdat store-label) ;; The controls (iup:frame #:title "Actions" (iup:vbox (iup:hbox | | | | | | | | 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 | (test-info-panel testdat store-label widgets) (test-meta-panel testmeta store-meta)) (host-info-panel testdat store-label) ;; The controls (iup:frame #:title "Actions" (iup:vbox (iup:hbox (iup:button "View Log" #:action viewlog #:size "80x") (iup:button "Start Xterm" #:action xterm #:size "80x") (iup:button "Run Test" #:action run-test #:size "80x") (iup:button "Clean Test" #:action remove-test #:size "80x") (iup:button "Close" #:action (lambda (x)(exit)) #:size "80x")) (apply iup:hbox (list command-text-box command-launch-button)))) (set-fields-panel test-id testdat) (iup:hbox (iup:frame #:title "Test Steps" (let ((stepsdat ;;(iup:label "Test steps ........................................." ;; #:expand "YES" ;; #:size "200x150" ;; #:alignment "ALEFT:ATOP"))) (iup:textbox ;; #:action (lambda (obj char val) ;; #f) #:expand "YES" #:multiline "YES" #:font "Courier New, -10" #:size "60x100"))) (hash-table-set! widgets "Test Steps" (lambda (testdat) (let* ((currval (iup:attribute stepsdat "VALUE")) ;; "TITLE")) (fmtstr "~20a~10a~10a~12a~15a") (comprsteps (db:get-steps-table db test-id)) (newval (string-intersperse (append |
︙ | ︙ | |||
406 407 408 409 410 411 412 | #:title "Test Data" (let ((test-data (iup:textbox ;; #:action (lambda (obj char val) ;; #f) #:expand "YES" #:multiline "YES" #:font "Courier New, -10" | | | 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 | #:title "Test Data" (let ((test-data (iup:textbox ;; #:action (lambda (obj char val) ;; #f) #:expand "YES" #:multiline "YES" #:font "Courier New, -10" #:size "100x100"))) (hash-table-set! widgets "Test Data" (lambda (testdat) ;; (let* ((currval (iup:attribute test-data "VALUE")) ;; "TITLE")) (fmtstr "~10a~10a~10a~10a~7a~7a~6a~a") ;; category,variable,value,expected,tol,units,comment (newval (string-intersperse (append (list |
︙ | ︙ |
Modified db.scm from [4f7891c314] to [18c6d5d535].
︙ | ︙ | |||
350 351 352 353 354 355 356 | (define-inline (db:test-get-first_err vec) (printable (vector-ref vec 15))) ;; 19))) (define-inline (db:test-get-first_warn vec) (printable (vector-ref vec 16))) ;; 20))) (define-inline (db:test-set-testname! vec val)(vector-set! vec 2 val)) (define-inline (db:test-set-state! vec val)(vector-set! vec 3 val)) (define-inline (db:test-set-status! vec val)(vector-set! vec 4 val)) | | | < < > > | | 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 | (define-inline (db:test-get-first_err vec) (printable (vector-ref vec 15))) ;; 19))) (define-inline (db:test-get-first_warn vec) (printable (vector-ref vec 16))) ;; 20))) (define-inline (db:test-set-testname! vec val)(vector-set! vec 2 val)) (define-inline (db:test-set-state! vec val)(vector-set! vec 3 val)) (define-inline (db:test-set-status! vec val)(vector-set! vec 4 val)) (define (db-get-tests-for-run db run-id testpatt itempatt) (let ((res '())) (sqlite3:for-each-row (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment first-err first-warn) (set! res (cons (vector id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment first-err first-warn) res))) db "SELECT id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment,first_err,first_warn FROM tests WHERE run_id=? AND testname like ? AND item_path LIKE ? ORDER BY id DESC;" run-id (if testpatt testpatt "%") (if itempatt itempatt "%")) res)) ;; this one is a bit broken BUG FIXME (define (db:delete-test-step-records db run-id test-name itemdat) (sqlite3:execute db "DELETE FROM test_steps WHERE test_id in (SELECT id FROM tests WHERE run_id=? AND testname=? AND item_path=?);" run-id test-name (item-list->path itemdat))) ;; |
︙ | ︙ | |||
530 531 532 533 534 535 536 | (comment (list-ref padded-row 6)) (status (let ((s (list-ref padded-row 7))) (if (and (string? s)(or (string-match (regexp "^\\s*$") s) (string-match (regexp "^n/a$") s))) #f s)))) ;; if specified on the input then use, else calculate ;; look up expected,tol,units from previous best fit test if they are all either #f or '' | | > | > > > | | | > > > > | 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 | (comment (list-ref padded-row 6)) (status (let ((s (list-ref padded-row 7))) (if (and (string? s)(or (string-match (regexp "^\\s*$") s) (string-match (regexp "^n/a$") s))) #f s)))) ;; if specified on the input then use, else calculate ;; look up expected,tol,units from previous best fit test if they are all either #f or '' (debug:print 4 "BEFORE: category: " category " variable: " variable " value: " value ", expected: " expected " tol: " tol " units: " units " status: " status " comment: " comment) (if (and (or (not expected)(equal? expected "")) (or (not tol) (equal? expected "")) (or (not units) (equal? expected ""))) (let-values (((new-expected new-tol new-units)(db:get-prev-tol-for-test db test-id category variable))) (set! expected new-expected) (set! tol new-tol) (set! units new-units))) (debug:print 4 "AFTER: category: " category " variable: " variable " value: " value ", expected: " expected " tol: " tol " units: " units " status: " status " comment: " comment) ;; calculate status if NOT specified (if (and (not status)(number? expected)(number? value)) ;; need expected and value to be numbers (if (number? tol) ;; if tol is a number then we do the standard comparison (let* ((max-val (+ expected tol)) (min-val (- expected tol)) (result (and (>= value min-val)(<= value max-val)))) (debug:print 4 "max-val: " max-val " min-val: " min-val " result: " result) (set! status (if result "pass" "fail"))) (set! status ;; NB// need to assess each one (i.e. not return operator since need to act if not valid op. (case (string->symbol tol) ;; tol should be >, <, >=, <= ((>) (if (> value expected) "pass" "fail")) ((<) (if (< value expected) "pass" "fail")) ((>=) (if (>= value expected) "pass" "fail")) ((<=) (if (<= value expected) "pass" "fail")) (else (conc "ERROR: bad tol comparator " tol)))))) (debug:print 4 "AFTER2: category: " category " variable: " variable " value: " value ", expected: " expected " tol: " tol " units: " units " status: " status " comment: " comment) (sqlite3:execute db "INSERT OR REPLACE INTO test_data (test_id,category,variable,value,expected,tol,units,comment,status) VALUES (?,?,?,?,?,?,?,?,?);" test-id category variable value expected tol units (if comment comment "") status))) csvlist))) ;; get a list of test_data records matching categorypatt (define (db:read-test-data db test-id categorypatt) (let ((res '())) |
︙ | ︙ | |||
716 717 718 719 720 721 722 | ;; ;; Return a list of prereqs that were NOT met ;; Tests (and all items) in waiton list must be "COMPLETED" and "PASS" (define (db-get-prereqs-not-met db run-id waiton) (if (null? waiton) '() (let* ((unmet-pre-reqs '()) | | | 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 | ;; ;; Return a list of prereqs that were NOT met ;; Tests (and all items) in waiton list must be "COMPLETED" and "PASS" (define (db-get-prereqs-not-met db run-id waiton) (if (null? waiton) '() (let* ((unmet-pre-reqs '()) (tests (db-get-tests-for-run db run-id #f #f)) (result '())) (for-each (lambda (waitontest-name) (let ((ever-seen #f)) (for-each (lambda (test) (if (equal? waitontest-name (db:test-get-testname test)) (begin (set! ever-seen #t) |
︙ | ︙ |
Modified megatest.scm from [5cbadc7e03] to [2e3a20ccc5].
︙ | ︙ | |||
386 387 388 389 390 391 392 | (debug:print 2 "Exectuing " test-name " on " (get-host-name)) (change-directory testpath) (setenv "MT_TEST_RUN_DIR" work-area) (setenv "MT_TEST_NAME" test-name) (setenv "MT_ITEM_INFO" (conc itemdat)) (setenv "MT_RUNNAME" runname) (setenv "MT_MEGATEST" megatest) | | | 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 | (debug:print 2 "Exectuing " test-name " on " (get-host-name)) (change-directory testpath) (setenv "MT_TEST_RUN_DIR" work-area) (setenv "MT_TEST_NAME" test-name) (setenv "MT_ITEM_INFO" (conc itemdat)) (setenv "MT_RUNNAME" runname) (setenv "MT_MEGATEST" megatest) (if mt-bindir-path (setenv "PATH" (conc (getenv "PATH") ":" mt-bindir-path))) (if (not (setup-for-run)) (begin (debug:print 0 "Failed to setup, exiting") (exit 1))) ;; now can find our db (set! db (open-db)) |
︙ | ︙ |
Modified runs.scm from [10c3a07445] to [ba29b0b8e2].
︙ | ︙ | |||
117 118 119 120 121 122 123 | (let loop ((hed (car prev-run-ids)) (tal (cdr prev-run-ids))) (let ((results (db-get-tests-for-run db hed test-name item-path))) (debug:print 4 "Got tests for run-id " run-id ", test-name " test-name ", item-path " item-path ": " results) (if (and (null? results) (not (null? tal))) (loop (car tal)(cdr tal)) | > | | 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 | (let loop ((hed (car prev-run-ids)) (tal (cdr prev-run-ids))) (let ((results (db-get-tests-for-run db hed test-name item-path))) (debug:print 4 "Got tests for run-id " run-id ", test-name " test-name ", item-path " item-path ": " results) (if (and (null? results) (not (null? tal))) (loop (car tal)(cdr tal)) (if (null? results) #f (car results)))))))))) ;; get the previous records for when these tests were run where all keys match but runname ;; NB// Merge this with test:get-previous-test-run-records? This one looks for all matching tests ;; can use wildcards. (define (test:get-matching-previous-test-run-records db run-id test-name item-path) (let* ((keys (db:get-keys db)) (selstr (string-intersperse (map (lambda (x)(vector-ref x 0)) keys) ",")) |
︙ | ︙ |
Added utils/mk_dashboard_wrapper version [37e41509e7].
> > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 | #!/bin/bash prefix=$1 echo "#!/bin/bash" if [ $LD_LIBRARY_PATH != "" ];then echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" fi dboard=`realpath $prefix/bin/dboard` echo "$dboard \$*" |
Modified utils/mt_laststep from [3e6695b426] to [7710982a12].
1 2 3 4 5 6 7 8 | #!/bin/bash # Purpose: run a step, record start and end with exit codes, if sucessful # update test status with PASS, else update with FAIL # # Call like this: # mt_laststep stepname command .... # | > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 | #!/bin/bash if [ $MT_CMDINFO == "" ];then echo "ERROR: $0 should be run within a megatest test environment" exit fi # Purpose: run a step, record start and end with exit codes, if sucessful # update test status with PASS, else update with FAIL # # Call like this: # mt_laststep stepname command .... # |
︙ | ︙ |