@@ -11,11 +11,11 @@ ;;====================================================================== ;; Test info panel ;;====================================================================== -(use format) +(use format fmt) (require-library iup) (import (prefix iup iup:)) (use canvas-draw) @@ -81,10 +81,14 @@ ))))) ;;====================================================================== ;; Test meta panel ;;====================================================================== + +(define (test-meta-panel-get-description testmeta) + (fmt #f (with-width 40 (wrap-lines (db:testmeta-get-description testmeta))))) + (define (test-meta-panel testmeta store-meta) (iup:frame #:title "Test Meta Data" ; #:expand "YES" (iup:hbox ; #:expand "YES" (apply iup:vbox ; #:expand "YES" @@ -111,12 +115,13 @@ (lambda (testmeta)(db:testmeta-get-reviewed testmeta))) (store-meta "tags" (iup:label (db:testmeta-get-tags testmeta) #:expand "HORIZONTAL") (lambda (testmeta)(db:testmeta-get-tags testmeta))) (store-meta "description" - (iup:label (db:testmeta-get-description testmeta) #:size "x50"); #:expand "HORIZONTAL") - (lambda (testmeta)(db:testmeta-get-description testmeta))) + (iup:label (test-meta-panel-get-description testmeta) #:size "x50"); #:expand "HORIZONTAL") + (lambda (testmeta) + (test-meta-panel-get-description testmeta))) ))))) ;;====================================================================== ;; Run info panel @@ -128,16 +133,18 @@ (apply iup:vbox ; #:expand "YES" (append (map (lambda (keyval) (iup:label (conc (car keyval) " ") ; #:expand "HORIZONTAL" )) keydat) - (list (iup:label "runname ")))) + (list (iup:label "runname ")(iup:label "run-id")))) (apply iup:vbox (append (map (lambda (keyval) (iup:label (cadr keyval) #:expand "HORIZONTAL")) keydat) - (list (iup:label runname)(iup:label "" #:expand "VERTICAL"))))))) + (list (iup:label runname) + (iup:label (conc (db:test-get-run_id testdat))) + (iup:label "" #:expand "VERTICAL"))))))) ;;====================================================================== ;; Host info panel ;;====================================================================== (define (host-info-panel testdat store-label) @@ -343,22 +350,22 @@ (let ((cmd (iup:attribute command-text-box "VALUE"))) (system (conc cmd " &")))))) (run-test (lambda (x) (iup:attribute-set! command-text-box "VALUE" - (conc "xterm -geometry 180x20 -e \"megatest -runtests " testname " -target " keystring " :runname " runname - " -itempatt " (if (equal? item-path "") - "%" - item-path) + (conc "xterm -geometry 180x20 -e \"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'\"")))) (remove-test (lambda (x) (iup:attribute-set! command-text-box "VALUE" - (conc "xterm -geometry 180x20 -e \"megatest -remove-runs -target " keystring " :runname " runname " -testpatt " testname " -itempatt " - (if (equal? item-path "") - "%" - item-path) + (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