Overview
Comment: | Merged minor fixes from v1.55 |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
83635d09621f8f4497391d02596cfcfb |
User & Date: | matt on 2013-11-16 21:12:33 |
Other Links: | manifest | tags |
Context
2013-11-16
| ||
23:13 | Switched away from json check-in: 575dfee04c user: matt tags: trunk | |
21:12 | Merged minor fixes from v1.55 check-in: 83635d0962 user: matt tags: trunk | |
2013-11-15
| ||
16:55 | Added waiver dialog check-in: adbd2563fb user: mrwellan tags: v1.55, v1.5514 | |
05:22 | Merged fixes from v1.55 check-in: d63f1371a4 user: matt tags: trunk | |
Changes
Modified api.scm from [306fb2ca21] to [6602e90b97].
︙ | ︙ | |||
45 46 47 48 49 50 51 52 53 54 55 56 57 58 | (map (lambda (x) (if (vector? x) (vector->list x) x)) res))) ((roll-up-pass-fail-counts) (apply db:roll-up-pass-fail-counts db params)) ((update-fail-pass-counts) (apply db:general-call db 'update-pass-fail-counts params)) ;; RUNS ((get-run-info) (let ((res (apply db:get-run-info db params))) (list (vector-ref res 0) (vector->list (vector-ref res 1))))) ((register-run) (apply db:register-run db params)) ((set-tests-state-status) (apply db:set-tests-state-status db params)) | > | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | (map (lambda (x) (if (vector? x) (vector->list x) x)) res))) ((roll-up-pass-fail-counts) (apply db:roll-up-pass-fail-counts db params)) ((update-fail-pass-counts) (apply db:general-call db 'update-pass-fail-counts params)) ((get-count-tests-running-for-run-id) (apply db:get-count-tests-running-for-run-id db params)) ;; RUNS ((get-run-info) (let ((res (apply db:get-run-info db params))) (list (vector-ref res 0) (vector->list (vector-ref res 1))))) ((register-run) (apply db:register-run db params)) ((set-tests-state-status) (apply db:set-tests-state-status db params)) |
︙ | ︙ |
Modified dashboard-tests.scm from [d29ac1e9dd] to [a39a855272].
︙ | ︙ | |||
221 222 223 224 225 226 227 228 229 230 231 232 233 234 | (newstate #f)) (iup:frame #:title "Set fields" (iup:vbox (iup:hbox (iup:label "Comment:") (iup:textbox #:action (lambda (val a b) (db:test-set-state-status-by-id db test-id #f #f b) (set! newcomment b)) #:value (db:test-get-comment testdat) #:expand "HORIZONTAL")) (apply iup:hbox (iup:label "STATE:" #:size "30x") (let* ((btns (map (lambda (state) (let ((btn (iup:button state | > | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 | (newstate #f)) (iup:frame #:title "Set fields" (iup:vbox (iup:hbox (iup:label "Comment:") (iup:textbox #:action (lambda (val a b) (db:test-set-state-status-by-id db test-id #f #f b) ;; IDEA: Just set a variable with the proc to call? (set! newcomment b)) #:value (db:test-get-comment testdat) #:expand "HORIZONTAL")) (apply iup:hbox (iup:label "STATE:" #:size "30x") (let* ((btns (map (lambda (state) (let ((btn (iup:button state |
︙ | ︙ | |||
250 251 252 253 254 255 256 | btns)) (apply iup:hbox (iup:label "STATUS:" #:size "30x") (let* ((btns (map (lambda (status) (let ((btn (iup:button status #:expand "HORIZONTAL" #:size "50x" #:font "Courier New, -10" #:action (lambda (x) | > > > > > | | | 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 | btns)) (apply iup:hbox (iup:label "STATUS:" #:size "30x") (let* ((btns (map (lambda (status) (let ((btn (iup:button status #:expand "HORIZONTAL" #:size "50x" #:font "Courier New, -10" #:action (lambda (x) (let ((t (iup:attribute x "TITLE"))) (if (equal? t "WAIVED") (iup:show (dashboard-tests:waiver testdat (lambda (c) (set! newcomment c)))) (begin (open-run-close db:test-set-state-status-by-id db test-id #f status #f) (db:test-set-status! testdat status)))))))) btn)) (map cadr *common:std-statuses*)))) ;; (list "PASS" "WARN" "FAIL" "CHECK" "n/a" "WAIVED" "SKIP")))) (vector-set! *state-status* 1 (lambda (status color) (for-each (lambda (btn) (let* ((name (iup:attribute btn "TITLE")) |
︙ | ︙ | |||
298 299 300 301 302 303 304 305 306 307 308 309 310 311 | (ezsteps:run-from testdat stepname #f)) (conc "ezstep run from step " stepname))))) ;; (iup:button "Refresh test data" ;; #:expand "HORIZONTAL" ;; #:action (lambda (obj) ;; (print "Refresh test data " stepname)) ))) ;; CHECK - WAS THIS ADDED OR REMOVED? MANUAL MERGE WITH API STUFF!!! ;; ;; get a pretty table to summarize steps ;; (define (dashboard-tests:process-steps-table steps);; db test-id #!key (work-area #f)) ;; (let ((steps (db:get-steps-for-test db test-id work-area: work-area))) | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 | (ezsteps:run-from testdat stepname #f)) (conc "ezstep run from step " stepname))))) ;; (iup:button "Refresh test data" ;; #:expand "HORIZONTAL" ;; #:action (lambda (obj) ;; (print "Refresh test data " stepname)) ))) (define (dashboard-tests:waiver testdat cmtcmd) (let* ((wpatt (configf:lookup *configdat* "setup" "waivercommentpatt")) (wregx (if (string? wpatt)(regexp wpatt) #f)) (wmesg (iup:label (if wpatt (conc "Comment must match pattern " wpatt) ""))) (comnt (iup:textbox #:action (lambda (val a b) (if wpatt (if (string-match wregx b) (iup:attribute-set! wmesg "TITLE" (conc "Comment matches " wpatt)) (iup:attribute-set! wmesg "TITLE" (conc "Comment does not match " wpatt)) ))) #:value (db:test-get-comment testdat) #:expand "HORIZONTAL")) (dlog #f)) (set! dlog (iup:dialog ;; #:close_cb (lambda (a)(exit)) ; #:expand "YES" #:title "SET WAIVER" (iup:vbox ; #:expand "YES" (iup:label (conc "Enter justification for waiving test " (db:test-get-testname testdat) (if (equal? (db:test-get-item-path testdat) "") "" (conc "/" (db:test-get-item-path testdat))))) wmesg ;; the informational msg on whether it matches comnt (iup:hbox (iup:button "Apply and Close " #:expand "HORIZONTAL" #:action (lambda (obj) (let ((comment (iup:attribute comnt "VALUE")) (test-id (db:test-get-id testdat))) (if (or (not wpatt) (string-match wregx comment)) (begin (open-run-close db:test-set-state-status-by-id #f test-id #f "WAIVED" comment) (db:test-set-status! testdat "WAIVED") (cmtcmd comment) (iup:destroy! dlog)))))) (iup:button "Cancel" #:expand "HORIZONTAL" #:action (lambda (obj) (iup:destroy! dlog))))))) dlog)) ;; CHECK - WAS THIS ADDED OR REMOVED? MANUAL MERGE WITH API STUFF!!! ;; ;; get a pretty table to summarize steps ;; (define (dashboard-tests:process-steps-table steps);; db test-id #!key (work-area #f)) ;; (let ((steps (db:get-steps-for-test db test-id work-area: work-area))) |
︙ | ︙ |
Modified rmt.scm from [5c9e78c3e2] to [9538710db7].
︙ | ︙ | |||
171 172 173 174 175 176 177 178 179 180 181 182 183 184 | (let ((res (rmt:send-receive 'get-prereqs-not-met (list run-id waitons ref-item-path mode)))) (map (lambda (x) (if (list? x) (list->vector x) x)) res))) ;; Statistical queries (define (rmt:get-count-tests-running) (rmt:send-receive 'get-count-tests-running '())) (define (rmt:get-count-tests-running-in-jobgroup jobgroup) (rmt:send-receive 'get-count-tests-running-in-jobgroup (list jobgroup))) | > > > | 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | (let ((res (rmt:send-receive 'get-prereqs-not-met (list run-id waitons ref-item-path mode)))) (map (lambda (x) (if (list? x) (list->vector x) x)) res))) (define (rmt:get-count-tests-running-for-run-id run-id) (rmt:send-receive 'get-count-tests-running-for-run-id (list run-id))) ;; Statistical queries (define (rmt:get-count-tests-running) (rmt:send-receive 'get-count-tests-running '())) (define (rmt:get-count-tests-running-in-jobgroup jobgroup) (rmt:send-receive 'get-count-tests-running-in-jobgroup (list jobgroup))) |
︙ | ︙ |
Modified runs.scm from [921dea1ab6] to [9a63a1bcac].
︙ | ︙ | |||
806 807 808 809 810 811 812 | (priority (tests:testqueue-get-priority test-record)) (itemdat (tests:testqueue-get-itemdat test-record)) ;; itemdat can be a string, list or #f (items (tests:testqueue-get-items test-record)) (item-path (item-list->path itemdat)) (tfullname (runs:make-full-test-name test-name item-path)) (newtal (append tal (list hed))) (regfull (>= (length reg) reglen)) | | | 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 | (priority (tests:testqueue-get-priority test-record)) (itemdat (tests:testqueue-get-itemdat test-record)) ;; itemdat can be a string, list or #f (items (tests:testqueue-get-items test-record)) (item-path (item-list->path itemdat)) (tfullname (runs:make-full-test-name test-name item-path)) (newtal (append tal (list hed))) (regfull (>= (length reg) reglen)) (num-running (rmt:get-count-tests-running-for-run-id run-id))) (if (> num-running 0) (set! last-time-some-running (current-seconds))) (if (> (current-seconds)(+ last-time-some-running 60)) (hash-table-set! *max-tries-hash* tfullname (+ (hash-table-ref/default *max-tries-hash* tfullname 0) 1))) ;; (debug:print 0 "max-tries-hash: " (hash-table->alist *max-tries-hash*)) |
︙ | ︙ |
Modified tests/fullrun/megatest.config from [9ccb67a28b] to [eb4e1b22b2].
︙ | ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 | [tests-paths] 1 #{get misc parent}/simplerun/tests [setup] # Set launchwait to no to use the more agressive code that does not wait for the launch to complete before proceeding # this may save a few milliseconds on launching tests # launchwait no # Use http instead of direct filesystem access transport http # transport fs # If set to "default" the old code is used. Otherwise defaults to 200 or uses # numeric value given. | > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | [tests-paths] 1 #{get misc parent}/simplerun/tests [setup] # Set launchwait to no to use the more agressive code that does not wait for the launch to complete before proceeding # this may save a few milliseconds on launching tests # launchwait no waivercommentpatt ^WW\d+ [a-z].* # Use http instead of direct filesystem access transport http # transport fs # If set to "default" the old code is used. Otherwise defaults to 200 or uses # numeric value given. |
︙ | ︙ | |||
41 42 43 44 45 46 47 | # deadtime 600 # It is possible (but not recommended) to override the rsync command used # to populate the test directories. For test development the following # example can be useful # | | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | # deadtime 600 # It is possible (but not recommended) to override the rsync command used # to populate the test directories. For test development the following # example can be useful # testcopycmd cp --remove-destination -rsv TEST_SRC_PATH/. TEST_TARG_PATH/. >> TEST_TARG_PATH/mt_launch.log 2>> TEST_TARG_PATH/mt_launch.log # or for hard links # testcopycmd cp --remove-destination -rlv TEST_SRC_PATH/. TEST_TARG_PATH/. # FULL or 2, NORMAL or 1, OFF or 0 synchronous OFF |
︙ | ︙ |
Modified tests/fullrun/tests/all_toplevel/testconfig from [a36e0b7a97] to [4c397d46e3].
1 2 3 4 | [ezsteps] calcresults megatest -list-runs $MT_RUNNAME -target $MT_TARGET [requirements] | > | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 | [ezsteps] calcresults megatest -list-runs $MT_RUNNAME -target $MT_TARGET [requirements] waiton all_toplevel exit_0 exit_1 ez_exit2_fail ez_fail ez_pass ezlog_fail \ ezlog_fail_then_pass ezlog_pass ezlog_warn lineitem_fail lineitem_pass logpro_required_fail \ manual_example neverrun priority_1 priority_10 priority_10_waiton_1 priority_2 \ priority_3 priority_4 priority_5 priority_6 priority_7 priority_8 \ priority_9 runfirst singletest singletest2 sqlitespeed test_mt_vars \ ez_fail_quick test1 test2 special blocktestxz # This is a "toplevel" test, it does not require waitons to be non-FAIL to run mode toplevel |
Modified tests/fullrun/tests/sqlitespeed/runscript.rb from [45705f52bd] to [630bce8730].
1 2 | #! /usr/bin/env ruby | | | 1 2 3 4 5 6 7 8 9 10 | #! /usr/bin/env ruby require "#{ENV['MT_RUN_AREA_HOME']}/../resources/ruby/librunscript.rb" # run_record(stepname, cmd) - will record in db if exit code of script was zero or not run_and_record('create db',"sqlite3 testing.db << EOF\ncreate table if not exists blah(id INTEGER PRIMARY KEY,name TEXT);\n.q\nEOF","") if (! File.exists?("../../runfirst/I_was_here")) puts "ERROR: This test was started before the prerequisites ran!" system "megatest -test-status :state INCOMPLETE :status FAIL" |
︙ | ︙ |
Added tests/resources/ruby/librunscript.rb version [a529a5a104].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 33 34 35 36 37 | # This is the library of stuff for megatest def run_and_record(stepname, cmd, checks) system "megatest -step #{stepname} :state start :status n/a" system cmd exitcode=$? if exitcode==0 exitcode='pass' else exitcode='fail' end system "megatest -step #{stepname} :state end :status #{exitcode}" end def record_step(stepname,state,status) system "megatest -step #{stepname} :state #{state} :status #{status}" end def test_status(state,status) system "megatest -test-status :state #{state} :status #{status}" end # WARNING: This example is deprecated. Don't use the -test-status command # unless you know for sure what you are doing. def file_size_checker(stepname,filename,minsize,maxsize) fsize=File.size(filename) if fsize > maxsize or fsize < minsize system "megatest -test-status :state COMPLETED :status fail" else system "megatest -test-status :state COMPLETED :status pass" end end def wait_for_step(testname,stepname) end |