Overview
Comment: | Added cleanrunexecute. Removed annoying output falsely announcing runstep |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.55 |
Files: | files | file ages | folders |
SHA1: |
d564af20b7972dc304a8a4bc4500020d |
User & Date: | mrwellan on 2013-08-02 17:22:48 |
Other Links: | branch diff | manifest | tags |
Context
2013-08-02
| ||
22:25 | Merged from dev into v1.55 check-in: c552e7eeab user: matt tags: v1.55 | |
17:22 | Added cleanrunexecute. Removed annoying output falsely announcing runstep check-in: d564af20b7 user: mrwellan tags: v1.55 | |
2013-08-01
| ||
08:24 | Added simple re-run for steps check-in: 699be61132 user: mrwellan tags: v1.55, was-v1.5511 | |
Changes
Modified dashboard-tests.scm from [8df2b4aff4] to [7e70dcfc3e].
︙ | ︙ | |||
266 267 268 269 270 271 272 | (iup:dialog ;; #:close_cb (lambda (a)(exit)) ; #:expand "YES" #:title stepname (iup:vbox ; #:expand "YES" (iup:label (conc "Step: " stepname "\nNB// These buttons only run the test step\nfor the purpose of debugging.\nNot all database updates are done.")) (iup:button "Re-run" #:expand "HORIZONTAL" #:action (lambda (obj) | > > | > > > | > | 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 | (iup:dialog ;; #:close_cb (lambda (a)(exit)) ; #:expand "YES" #:title stepname (iup:vbox ; #:expand "YES" (iup:label (conc "Step: " stepname "\nNB// These buttons only run the test step\nfor the purpose of debugging.\nNot all database updates are done.")) (iup:button "Re-run" #:expand "HORIZONTAL" #:action (lambda (obj) (thread-start! (make-thread (lambda () (ezsteps:run-from testdat stepname #f)) (conc "ezstep run single step " stepname))))) (iup:button "Re-run and continue" #:expand "HORIZONTAL" #:action (lambda (obj) (thread-start! (make-thread (lambda () (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)) ))) ;;====================================================================== |
︙ | ︙ | |||
434 435 436 437 438 439 440 | (remove-test (lambda (x) (iup:attribute-set! command-text-box "VALUE" (conc "xterm -geometry 180x20 -e \"megatest -remove-runs -target " keystring " :runname " runname " -testpatt " (conc testname "/" (if (equal? item-path "") "%" item-path)) | | > > > > > > > > > > > > > > > > > > > > > | 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 | (remove-test (lambda (x) (iup:attribute-set! command-text-box "VALUE" (conc "xterm -geometry 180x20 -e \"megatest -remove-runs -target " keystring " :runname " runname " -testpatt " (conc testname "/" (if (equal? item-path "") "%" item-path)) " -v ;echo Press any key to continue;bash -c 'read -n 1 -s'\"")))) (clean-run-execute (lambda (x) (let ((cmd (conc "xterm -geometry 180x20 -e \"" "megatest -remove-runs -target " keystring " :runname " runname " -testpatt " (conc testname "/" (if (equal? item-path "") "%" item-path)) ";megatest -target " keystring " :runname " runname " -runtests " (conc testname "/" (if (equal? item-path "") "%" item-path)) " ;echo Press any key to continue;bash -c 'read -n 1 -s'\""))) (system (conc cmd " &"))))) (remove-test (lambda (x) (iup:attribute-set! command-text-box "VALUE" (conc "xterm -geometry 180x20 -e \"megatest -remove-runs -target " keystring " :runname " runname " -testpatt " (conc testname "/" (if (equal? item-path "") "%" item-path)) " -v ;echo Press any key to continue;bash -c 'read -n 1 -s'\"")) ))) (cond ((not testdat)(begin (print "ERROR: bad test info for " test-id)(exit 1))) ((not rundat)(begin (print "ERROR: found test info but there is a problem with the run info for " run-id)(exit 1))) (else ;; (test-set-status! db run-id test-name state status itemdat) (set! self ; (iup:dialog #:close_cb (lambda (a)(exit)) ; #:expand "YES" |
︙ | ︙ | |||
458 459 460 461 462 463 464 465 466 467 468 469 470 471 | (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 "Kill All Jobs" #:action kill-jobs #: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) (let ((tabs | > | 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 | (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 "CleanRunExecute!" #:action clean-run-execute #:size "80x") (iup:button "Kill All Jobs" #:action kill-jobs #: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) (let ((tabs |
︙ | ︙ |
Modified ezsteps.scm from [9861c702d7] to [054b0d84c8].
︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 | (let* ((test-run-dir (db:test-get-rundir testdat)) (testconfig (read-config (conc test-run-dir "/testconfig") #f #t environ-patt: "pre-launch-env-vars")) (ezstepslst (hash-table-ref/default testconfig "ezsteps" '())) (run-mutex (make-mutex)) (rollup-status 0) (exit-info (vector #t #t #t)) (test-id (db:test-get-id testdat)) (kill-job #f)) ;; for future use (on re-factoring with launch.scm code (push-directory test-run-dir) (debug:print-info 0 "Running in directory " test-run-dir) (if (not (file-exists? ".ezsteps"))(create-directory ".ezsteps")) ;; if ezsteps was defined then we are sure to have at least one step but check anyway (if (not (> (length ezstepslst) 0)) (message-window "ERROR: You can only re-run steps defined via ezsteps") | > | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | (let* ((test-run-dir (db:test-get-rundir testdat)) (testconfig (read-config (conc test-run-dir "/testconfig") #f #t environ-patt: "pre-launch-env-vars")) (ezstepslst (hash-table-ref/default testconfig "ezsteps" '())) (run-mutex (make-mutex)) (rollup-status 0) (exit-info (vector #t #t #t)) (test-id (db:test-get-id testdat)) (test-name (db:test-get-testname testdat)) (kill-job #f)) ;; for future use (on re-factoring with launch.scm code (push-directory test-run-dir) (debug:print-info 0 "Running in directory " test-run-dir) (if (not (file-exists? ".ezsteps"))(create-directory ".ezsteps")) ;; if ezsteps was defined then we are sure to have at least one step but check anyway (if (not (> (length ezstepslst) 0)) (message-window "ERROR: You can only re-run steps defined via ezsteps") |
︙ | ︙ |
Modified megatest.scm from [d8bccf0232] to [5cecb64bdf].
︙ | ︙ | |||
883 884 885 886 887 888 889 | ;; (set! *runremote* runremote) (set! *transport-type* (string->symbol transport)) (if (not (setup-for-run)) (begin (debug:print 0 "Failed to setup, exiting") (exit 1))) | | | 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 | ;; (set! *runremote* runremote) (set! *transport-type* (string->symbol transport)) (if (not (setup-for-run)) (begin (debug:print 0 "Failed to setup, exiting") (exit 1))) (if (args:get-arg "-runstep")(debug:print-info 1 "Running -runstep, first change to directory " work-area)) (change-directory work-area) ;; can setup as client for server mode now ;; (client:setup) (if (args:get-arg "-load-test-data") ;; has sub commands that are rdb: ;; DO NOT put this one into either cdb:remote-run or open-run-close |
︙ | ︙ |