Check-in [c5b61052dd]
Not logged in
Overview
SHA1 Hash:c5b61052dd9c83469990901c24552dd9b21fb1b8
Date: 2011-10-12 23:26:10
User: matt
Comment:Added -reqtarg and -target for easier launching
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | manifest
Tags And Properties
Changes

Modified dashboard.scm from [ecffa2c95e1f4734] to [6f73d9a9e31e0fee].

531 (let ((labl (iup:button "" 531 (let ((labl (iup:button "" 532 #:flat "YES" 532 #:flat "YES" 533 ; #:image img1 533 ; #:image img1 534 ; #:impress img2 534 ; #:impress img2 535 #:size "100x15" 535 #:size "100x15" 536 #:fontsize "10" 536 #:fontsize "10" 537 #:action (lambda (obj) 537 #:action (lambda (obj) > 538 (set! *last-db-update-time* 0) 538 (toggle-hide testnum))))) ;; (iup: | 539 (toggle-hide testnum))))) ;; (iup:at 539 (vector-set! lftcol testnum labl) 540 (vector-set! lftcol testnum labl) 540 (loop (+ testnum 1)(cons labl res)))))) 541 (loop (+ testnum 1)(cons labl res)))))) 541 ;; 542 ;; 542 (let loop ((runnum 0) 543 (let loop ((runnum 0) 543 (keynum 0) 544 (keynum 0) 544 (keyvec (make-vector nkeys)) 545 (keyvec (make-vector nkeys)) 545 (res '())) 546 (res '()))

Modified keys.scm from [3d742549ec555e07] to [1fd229ce93d40b5c].

66 (string-intersperse (map key:get-fieldname keys) ",")) 66 (string-intersperse (map key:get-fieldname keys) ",")) 67 67 68 (define (args:usage . a) #f) 68 (define (args:usage . a) #f) 69 69 70 ;; keys->vallist is called several times (quite unnecessarily), use this hash to 70 ;; keys->vallist is called several times (quite unnecessarily), use this hash to 71 ;; reporting of missing keys on the command line. 71 ;; reporting of missing keys on the command line. 72 (define keys:warning-suppress-hash (make-hash-table)) 72 (define keys:warning-suppress-hash (make-hash-table)) > 73 > 74 ;; this now invalidates using "/" in item names > 75 (define (keys:target-set-args keys target ht) > 76 (let ((vals (string-split target "/"))) > 77 (if (eq? (length vals)(length keys)) > 78 (for-each (lambda (key val) > 79 (hash-table-set! ht (conc ":" (vector-ref key 0)) val)) > 80 keys > 81 vals) > 82 (debug:print 0 "ERROR: wrong number of values in " target ", should matc > 83 vals)) 73 84 74 ;; Using the keys pulled from the database (initially set from the megatest.conf 85 ;; Using the keys pulled from the database (initially set from the megatest.conf 75 ;; look for the equivalent value on the command line and add it to a list, or #f 86 ;; look for the equivalent value on the command line and add it to a list, or #f 76 ;; default => (val1 val2 val3 ...) 87 ;; default => (val1 val2 val3 ...) 77 ;; withkey => (:key1 val1 :key2 val2 :key3 val3 ...) 88 ;; withkey => (:key1 val1 :key2 val2 :key3 val3 ...) 78 (define (keys->vallist keys . withkey) ;; ORDERING IS VERY IMPORTANT, KEEP PROPE 89 (define (keys->vallist keys . withkey) ;; ORDERING IS VERY IMPORTANT, KEEP PROPE 79 (let* ((keynames (map key:get-fieldname keys)) 90 (let* ((keynames (map key:get-fieldname keys))

Modified megatest.scm from [b0196f050b175929] to [8f64633af088dab9].

45 -setlog logfname : set the path/filename to the final log relative to t 45 -setlog logfname : set the path/filename to the final log relative to t 46 directory. may be used with -test-status 46 directory. may be used with -test-status 47 -set-toplog logfname : set the overall log for a suite of sub-tests 47 -set-toplog logfname : set the overall log for a suite of sub-tests 48 -summarize-items : for an itemized test create a summary html 48 -summarize-items : for an itemized test create a summary html 49 -m comment : insert a comment for this test 49 -m comment : insert a comment for this test 50 50 51 Run data 51 Run data > 52 -target key1/key2/... : run for key1, key2, etc. > 53 -reqtarg key1/key2/... : run for key1, key2, etc. but key1/key2 must be in ru 52 :runname : required, name for this particular test run 54 :runname : required, name for this particular test run 53 :state : required if updating step state; e.g. start, end, co 55 :state : required if updating step state; e.g. start, end, co 54 :status : required if updating step status; e.g. pass, fail, n 56 :status : required if updating step status; e.g. pass, fail, n 55 57 56 Values and record errors and warnings 58 Values and record errors and warnings 57 -set-values : update or set values in the megatest db 59 -set-values : update or set values in the megatest db 58 :category : set the category field (optional) 60 :category : set the category field (optional) 59 :variable : set the variable name (optional) 61 :variable : set the variable name (optional) 60 :value : value measured (required) 62 :value : value measured (required) 61 :expected : value expected (required) 63 :expected : value expected (required) 62 :tol : |value-expect| <= tol (required, can be <, >, >=, <= 64 :tol : |value-expect| <= tol (required, can be <, >, >=, <= 63 :units : name of the units for value, expected_value etc. (op 65 :units : name of the units for value, expected_value etc. (op 64 :first_err : record an error message < 65 :first_warn : record a warning message < 66 66 67 Arbitrary test data loading 67 Arbitrary test data loading 68 -load-test-data : read test specific data for storage in the test_data 68 -load-test-data : read test specific data for storage in the test_data 69 from standard in. Each line is comma delimited with 69 from standard in. Each line is comma delimited with 70 fields category,variable,value,comment 70 fields category,variable,value,comment 71 71 72 Queries 72 Queries ................................................................................................................................................................................ 109 (define remargs (args:get-args 109 (define remargs (args:get-args 110 (argv) 110 (argv) 111 (list "-runtests" ;; run a specific test 111 (list "-runtests" ;; run a specific test 112 "-config" ;; override the config file name 112 "-config" ;; override the config file name 113 "-execute" ;; run the command encoded in the base64 pa 113 "-execute" ;; run the command encoded in the base64 pa 114 "-step" 114 "-step" 115 ":runname" 115 ":runname" > 116 "-target" > 117 "-reqtarg" 116 ":item" 118 ":item" 117 ":runname" 119 ":runname" 118 ":state" 120 ":state" 119 ":status" 121 ":status" 120 "-list-runs" 122 "-list-runs" 121 "-testpatt" 123 "-testpatt" 122 "-itempatt" 124 "-itempatt" ................................................................................................................................................................................ 128 "-rerun" 130 "-rerun" 129 "-days" 131 "-days" 130 "-rename-run" 132 "-rename-run" 131 "-to" 133 "-to" 132 ;; values and messages 134 ;; values and messages 133 ":category" 135 ":category" 134 ":variable" 136 ":variable" 135 ":first_err" < 136 ":first_warn" < 137 ":value" 137 ":value" 138 ":expected" 138 ":expected" 139 ":tol" 139 ":tol" 140 ":units" 140 ":units" 141 ;; misc 141 ;; misc 142 "-extract-ods" 142 "-extract-ods" 143 "-env2file" 143 "-env2file"

Modified runs.scm from [96f6e3d21bf513f8] to [c8075385d1f3f49b].

827 ;; Since many calls to a run require pretty much the same setup 827 ;; Since many calls to a run require pretty much the same setup 828 ;; this wrapper is used to reduce the replication of code 828 ;; this wrapper is used to reduce the replication of code 829 (define (general-run-call switchname action-desc proc) 829 (define (general-run-call switchname action-desc proc) 830 (if (not (args:get-arg ":runname")) 830 (if (not (args:get-arg ":runname")) 831 (begin 831 (begin 832 (debug:print 0 "ERROR: Missing required parameter for " switchname ", yo 832 (debug:print 0 "ERROR: Missing required parameter for " switchname ", yo 833 (exit 2)) 833 (exit 2)) 834 (let ((db #f)) | 834 (let ((db #f) > 835 (keys #f)) 835 (if (not (setup-for-run)) 836 (if (not (setup-for-run)) 836 (begin 837 (begin 837 (debug:print 0 "Failed to setup, exiting") 838 (debug:print 0 "Failed to setup, exiting") 838 (exit 1))) 839 (exit 1))) 839 (set! db (open-db)) | 840 (set! db (open-db)) > 841 (set! keys (db-get-keys db)) > 842 ;; have enough to process -target or -reqtarg here > 843 (if (args:get-arg "-reqtarg") > 844 (let* ((runconfigf (conc *toppath* "/runconfigs.config")) > 845 (runconfig (read-config runconfigf #f #f))) > 846 (if (hash-table-ref/default runconfig (args:get-arg "-reqtarg") #f > 847 (keys:target-set-args keys (args:get-arg "-reqtarg") args:arg- > 848 (begin > 849 (debug:print 0 "ERROR: [" (args:get-arg "-reqtarg") "] not f > 850 (sqlite3:finalize! db) > 851 (exit 1)))) > 852 (if (args:get-arg "-target") > 853 (keys:target-set-args keys (args:get-arg "-target" args:arg-hash 840 (if (not (car *configinfo*)) 854 (if (not (car *configinfo*)) 841 (begin 855 (begin 842 (debug:print 0 "ERROR: Attempted to " action-desc " but run area c 856 (debug:print 0 "ERROR: Attempted to " action-desc " but run area c 843 (exit 1)) 857 (exit 1)) 844 ;; Extract out stuff needed in most or many calls 858 ;; Extract out stuff needed in most or many calls 845 ;; here then call proc 859 ;; here then call proc 846 (let* ((keys (db-get-keys db)) < 847 (keynames (map key:get-fieldname keys)) | 860 (let* ((keynames (map key:get-fieldname keys)) 848 (keyvallst (keys->vallist keys #t))) 861 (keyvallst (keys->vallist keys #t))) 849 (proc db keys keynames keyvallst))) 862 (proc db keys keynames keyvallst))) 850 (sqlite3:finalize! db) 863 (sqlite3:finalize! db) 851 (set! *didsomething* #t)))) 864 (set! *didsomething* #t)))) 852 865 853 ;;====================================================================== 866 ;;====================================================================== 854 ;; Rollup runs 867 ;; Rollup runs

Modified tests/runconfigs.config from [ddf71be59a6a7bd6] to [c494d9b2b2d8f822].

1 [/tmp/mrwellan/env/ubuntu/afs] 1 [/tmp/mrwellan/env/ubuntu/afs] 2 BOGOUS Bob 2 BOGOUS Bob 3 3 4 [default/ubuntu/nfs] 4 [default/ubuntu/nfs] 5 CURRENT /blah 5 CURRENT /blah > 6 > 7 [ubuntu/nfs/none] > 8 CURRENT /tmp/nada > 9 6 10 7 [default] 11 [default]