Overview
Comment: | Added placeholder for .dat reading |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.61 |
Files: | files | file ages | folders |
SHA1: |
d88df2377f255f50329ded0520c28060 |
User & Date: | mrwellan on 2016-05-06 19:44:12 |
Other Links: | branch diff | manifest | tags |
Context
2016-05-06
| ||
23:51 | Data from stepname.dat now in test_data check-in: ba634ba17b user: matt tags: v1.61 | |
19:44 | Added placeholder for .dat reading check-in: d88df2377f user: mrwellan tags: v1.61 | |
2016-05-05
| ||
16:00 | Fixed unchecked hash before accessing it. check-in: c4685ae4f9 user: mrwellan tags: v1.61 | |
Changes
Modified db.scm from [3b6c66a467] to [e681d7664e].
︙ | ︙ | |||
2811 2812 2813 2814 2815 2816 2817 | (SELECT count(id) FROM test_data WHERE test_id=? AND status like 'pass') AS pass_count;" test-id test-id) ;; Now rollup the counts to the central megatest.db (db:general-call dbdat 'pass-fail-counts (list pass-count fail-count test-id)) ;; if the test is not FAIL then set status based on the fail and pass counts. (db:general-call dbdat 'test_data-pf-rollup (list test-id test-id test-id test-id)))) | > | > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 | (SELECT count(id) FROM test_data WHERE test_id=? AND status like 'pass') AS pass_count;" test-id test-id) ;; Now rollup the counts to the central megatest.db (db:general-call dbdat 'pass-fail-counts (list pass-count fail-count test-id)) ;; if the test is not FAIL then set status based on the fail and pass counts. (db:general-call dbdat 'test_data-pf-rollup (list test-id test-id test-id test-id)))) ;; each section is a rule except "final" which is the final result ;; ;; [rule-5] ;; operator in ;; section LogFileBody ;; desc Output voltage ;; status OK ;; expected 1.9 ;; measured 1.8 ;; type +/- ;; tolerance 0.1 ;; pass 1 ;; fail 0 ;; ;; [final] ;; exit-code 6 ;; exit-status SKIP ;; message If flagged we are asking for this to exit with code 6 ;; ;; recorded in steps table: ;; category: stepname ;; variable: rule-N ;; value: measured ;; expected: expected ;; tol: tolerance ;; units: - ;; comment: desc or message ;; status: status ;; type: type ;; (define (db:logpro-dat->csv dat stepname) (let ((res '())) (for-each (lambda (entry-name) (let* ((var entry-name) (value (or (configf:lookup dat entry-name "measured") "n/a")) (expected (or (configf:lookup dat entry-name "expected") "n/a")) (tolerance (or (configf:lookup dat entry-name "tolerance") "n/a")) (comment (or (configf:lookup dat entry-name "comment") (configf:lookup dat entry-name "desc") "n/a")) (status (or (configf:lookup dat entry-name "status") "n/a")) (type (or (configf:lookup dat entry-name "expected") "n/a"))) #f)) (hash-table-keys dat)) res)) ;; $MT_MEGATEST -load-test-data << EOF ;; foo,bar, 1.2, 1.9, > ;; foo,rab, 1.0e9, 10e9, 1e9 ;; foo,bla, 1.2, 1.9, < ;; foo,bal, 1.2, 1.2, < , ,Check for overload ;; foo,alb, 1.2, 1.2, <= , Amps,This is the high power circuit test ;; foo,abl, 1.2, 1.3, 0.1 ;; foo,bra, 1.2, pass, silly stuff ;; faz,bar, 10, 8mA, , ,"this is a comment" ;; EOF (define (db:csv->test-data dbstruct run-id test-id csvdata) (debug:print 4 "test-id " test-id ", csvdata: " csvdata) (let* ((dbdat (db:get-db dbstruct run-id)) (db (db:dbdat-get-db dbdat)) (csvlist (csv->list (make-csv-reader (open-input-string csvdata) '((strip-leading-whitespace? #t) (strip-trailing-whitespace? #t)))))) ;; (csv->list csvdata))) (for-each (lambda (csvrow) (let* ((padded-row (take (append csvrow (list #f #f #f #f #f #f #f #f #f)) 9)) (category (list-ref padded-row 0)) (variable (list-ref padded-row 1)) (value (any->number-if-possible (list-ref padded-row 2))) (expected (any->number-if-possible (list-ref padded-row 3))) (tol (any->number-if-possible (list-ref padded-row 4))) ;; >, <, >=, <=, or a number |
︙ | ︙ |