Index: dashboard-main.scm ================================================================== --- dashboard-main.scm +++ dashboard-main.scm @@ -137,43 +137,58 @@ (iup:attribute-set! mat "WIDTH1" "120") (iup:attribute-set! mat "WIDTH0" "100") ) (list setup-matrix jobtools-matrix validvals-matrix envovrd-matrix)) + (iup:attribute-set! validvals-matrix "WIDTH1" "290") + (iup:attribute-set! envovrd-matrix "WIDTH1" "290") + (iup:vbox (iup:hbox - ;; The keys - (iup:frame - #:title "Keys (required)" - (iup:vbox - (iup:label (conc "Set the fields for organising your runs\n" - "here. Note: can only be changed before\n" - "running the first run when megatest.db\n" - "is created.")) - keys-matrix)) + (iup:vbox (let ((tabs (iup:tabs ;; The required tab - (iup:vbox - ;; The setup section - (iup:frame - #:title "Setup" - setup-matrix) - ;; The jobtools - (iup:frame - #:title "Jobtools" - jobtools-matrix) - ;; The valid values - ;; The disks - (iup:frame - #:title "Disks" - disks-matrix)) + (iup:hbox + ;; The keys + (iup:frame + #:title "Keys (required)" + (iup:vbox + (iup:label (conc "Set the fields for organising your runs\n" + "here. Note: can only be changed before\n" + "running the first run when megatest.db\n" + "is created.")) + keys-matrix)) + (iup:vbox + ;; The setup section + (iup:frame + #:title "Setup" + (iup:vbox + (iup:label (conc "max_concurrent_jobs : limits total concurrent jobs (optional)\n" + "linktree : directory where linktree will be created.")) + setup-matrix)) + ;; The jobtools + (iup:frame + #:title "Jobtools" + (iup:vbox + (iup:label (conc "launcher : tool or script to run jobs (try nbfake)\n" + "useshell : use system to run your launcher\n" + "workhosts : spread jobs out on these hosts")) + jobtools-matrix)) + ;; The disks + (iup:frame + #:title "Disks" + (iup:vbox + (iup:label (conc "Enter names and existing paths of locations to run tests")) + disks-matrix)))) + ;; The optional tab (iup:vbox ;; The Environment Overrides (iup:frame #:title "Env override" envovrd-matrix) + ;; The valid values (iup:frame #:title "Validvalues" validvals-matrix) )))) (iup:attribute-set! tabs "TABTITLE0" "Required settings") Index: tests/tests/ezlog_warn/lookittmp.logpro ================================================================== --- tests/tests/ezlog_warn/lookittmp.logpro +++ tests/tests/ezlog_warn/lookittmp.logpro @@ -2,9 +2,11 @@ ;; ;; License GPL. (expect:warning in "LogFileBody" = 0 "Any warning" #/.*/) -(expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/) +;; Can't have a required since it will mask the warns! Could make the warn non-overlapping with the +;; required I suppose... +;; (expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/) (expect:ignore in "LogFileBody" < 99 "Ignore the word error in comments" #/^\/\/.*error/) (expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/error/)) ;; but disallow any other errors ADDED tests/tests/logpro_required_fail/lookittmp.logpro Index: tests/tests/logpro_required_fail/lookittmp.logpro ================================================================== --- /dev/null +++ tests/tests/logpro_required_fail/lookittmp.logpro @@ -0,0 +1,8 @@ +;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com +;; +;; License GPL. + +(expect:required in "LogFileBody" > 0 "A file name that should never exist!" #/This is a awfully stupid file name that should never be found in the temp dir/) + +;; (expect:warning in "LogFileBody" = 0 "Any warning" #/WARNING/) +;; (expect:error in "LogFileBody" = 0 "Any error" (list #/ERROR/ #/.*/)) ;; force an error ADDED tests/tests/logpro_required_fail/testconfig Index: tests/tests/logpro_required_fail/testconfig ================================================================== --- /dev/null +++ tests/tests/logpro_required_fail/testconfig @@ -0,0 +1,12 @@ +[setup] + +[ezsteps] +lookittmp ls /tmp + +[test_meta] +author matt +owner bob +description This test runs two ezstep, the first of which is expected to fail using a simple logpro file. + +tags logpro +reviewed 09/10/2011, by Matt