Overview
| Comment: | Added vars with no value, proper creation of sheets index and dotfile loading to txtdb |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | dev |
| Files: | files | file ages | folders |
| SHA1: |
46eb920500c72777996edcbc651289d0 |
| User & Date: | matt on 2013-07-26 09:24:27 |
| Other Links: | branch diff | manifest | tags |
Context
|
2013-07-26
| ||
| 09:47 | Adding forgotten file check-in: 987788b967 user: matt tags: dev | |
| 09:24 | Added vars with no value, proper creation of sheets index and dotfile loading to txtdb check-in: 46eb920500 user: matt tags: dev | |
| 00:34 | Begingings of code in place for editing Megatest area using refdb check-in: 76df097649 user: matt tags: dev | |
Changes
Modified http-transport.scm from [7cb86699d1] to [389e48a519].
| ︙ | ︙ | |||
181 182 183 184 185 186 187 | ;; <html> ;; <head></head> ;; <body>1 Hello, world! Goodbye Dolly</body></html> ;; Send msg to serverdat and receive result (define (http-transport:client-send-receive serverdat msg #!key (numretries 30)) (let* (;; (url (http-transport:make-server-url serverdat)) | > > > > | | 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 |
;; <html>
;; <head></head>
;; <body>1 Hello, world! Goodbye Dolly</body></html>
;; Send msg to serverdat and receive result
(define (http-transport:client-send-receive serverdat msg #!key (numretries 30))
(let* (;; (url (http-transport:make-server-url serverdat))
(fullurl (if (list? serverdat)
(caddr serverdat)
(begin
(debug:print 0 "FATAL ERROR: http-transport:client-send-receive called with no server info")
(exit 1)))) ;; (conc url "/ctrl")) ;; (conc url "/?dat=" msg)))
(res #f))
(handle-exceptions
exn
(begin
(print "ERROR IN http-transport:client-send-receive " ((condition-property-accessor 'exn 'message) exn))
(thread-sleep! 2)
(if (> numretries 0)
|
| ︙ | ︙ |
Modified tests/fdktestqa/fdk.config from [3481fe6c37] to [d8147016d6].
1 2 3 4 5 6 | [fields] SYSTEM TEXT RELEASE TEXT [setup] # Adjust max_concurrent_jobs to limit how much you load your machines | | | 1 2 3 4 5 6 7 8 9 10 11 12 |
[fields]
SYSTEM TEXT
RELEASE TEXT
[setup]
# Adjust max_concurrent_jobs to limit how much you load your machines
max_concurrent_jobs 50
# This is your link path, you can move it but it is generally better to keep it stable
linktree #{shell readlink -f #{getenv PWD}/../simplelinks}
[include testqa/configs/megatest.abc.config]
|
Modified tests/fdktestqa/testqa/Makefile from [7ce2c42a50] to [b85c936a02].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | BINDIR = $(PWD)/../../../bin PATH := $(BINDIR):$(PATH) MEGATEST = $(BINDIR)/megatest DASHBOARD = $(BINDIR)/dashboard all : $(MEGATEST) -remove-runs -target a/b :runname c -testpatt %/% $(MEGATEST) -runtests % -target a/b :runname c bigbig : for tn in a b c d;do \ ($(MEGATEST) -runtests % -target a/b :runname $tn & ) ; \ done bigrun : $(MEGATEST) -runtests bigrun -target a/bigrun :runname a | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | BINDIR = $(PWD)/../../../bin PATH := $(BINDIR):$(PATH) MEGATEST = $(BINDIR)/megatest DASHBOARD = $(BINDIR)/dashboard all : $(MEGATEST) -remove-runs -target a/b :runname c -testpatt %/% $(MEGATEST) -runtests % -target a/b :runname c bigbig : $(MEGATEST) -server - -daemonize ; sleep 3 for tn in a b c d;do \ ($(MEGATEST) -runtests % -target a/b :runname $tn & ) ; \ done bigrun : $(MEGATEST) -runtests bigrun -target a/bigrun :runname a |
| ︙ | ︙ |
Modified tests/fullrun/tests/blocktestxz/testconfig from [4fa5a854fa] to [ffee4ad8a2].
1 2 3 4 5 6 7 8 9 10 | [setup] runscript main.sh [items] THESTATE UNKNOWN INCOMPLETE KILLED KILLREQ STUCK BOZZLEBLONKED STUCK/DEAD THESTATUS PASS FAIL STUCK/DEAD SKIP [test_meta] author matt owner bob | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | [setup] runscript main.sh [items] THESTATE UNKNOWN INCOMPLETE KILLED KILLREQ STUCK BOZZLEBLONKED STUCK/DEAD THESTATUS PASS FAIL STUCK/DEAD SKIP [test_meta] author matt owner bob description This test will fail causing the dependent test "testxz"\ to never run. This triggers the code that must determine\ that a test will never be run and thus remove it from\ the queue of tests to be run. tags first,single reviewed 1/1/1965 |
Modified tests/fullrun/tests/ez_exit2_fail/testconfig from [fc174ee7f2] to [f01baecf74].
1 2 3 4 5 6 7 8 9 | [setup] [ezsteps] exit2 exit 2 lookithome ls /home [test_meta] author matt owner bob | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | [setup] [ezsteps] exit2 exit 2 lookithome ls /home [test_meta] author matt owner bob description This test runs two steps; the first exits with\ code 2 (a fail because not using logpro) and the second\ is a pass tags first,single reviewed 09/10/2011, by Matt |
Modified tests/fullrun/tests/ezlog_fail_then_pass/testconfig from [be9f816262] to [4d4490bc7d].
1 2 3 4 5 6 7 8 | [setup] [ezsteps] firststep main.sh [test_meta] author matt owner bob | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | [setup] [ezsteps] firststep main.sh [test_meta] author matt owner bob description This test runs a single ezstep which is logpro clean\ but fails based on -test-data loaded. tags first,single reviewed 09/10/2011, by Matt |
Modified tests/fullrun/tests/manual_example/testconfig from [a183e20093] to [f5375aa3ae].
1 2 3 4 5 6 7 8 9 | [setup] [ezsteps] setup ./runsetupxterm.sh # launch launchxterm [test_meta] author matt owner bob | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | [setup] [ezsteps] setup ./runsetupxterm.sh # launch launchxterm [test_meta] author matt owner bob description This test runs a single ezstep which is expected to pass\ using a simple logpro file. tags first,single reviewed 09/10/2011, by Matt |
Modified tests/fullrun/tests/runfirst/testconfig from [e478348cce] to [784a9af124].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 | [itemstable] BLOCK a b TOCK 1 2 [test_meta] author matt owner bob | | | 13 14 15 16 17 18 19 20 21 22 23 24 | [itemstable] BLOCK a b TOCK 1 2 [test_meta] author matt owner bob description This test must\ be run before the other tests tags first,single reviewed 1/1/1965 |
Modified txtdb/nada3/First_Sheet.dat from [24c7e3bd47] to [f21615fd25].
1 2 3 4 5 6 7 8 | [Time] A 0.32430555555555557 B 0.33124999999999999 C 0.3347222222222222 D 0.33680555555555558 E 0.33888888888888891 F 0.34097222222222223 G 0.34305555555555556 | > | 1 2 3 4 5 6 7 8 9 | [Time] BLANKVAL A 0.32430555555555557 B 0.33124999999999999 C 0.3347222222222222 D 0.33680555555555558 E 0.33888888888888891 F 0.34097222222222223 G 0.34305555555555556 |
| ︙ | ︙ |
Modified txtdb/txtdb.scm from [1bdd1d89fa] to [ae5c648d2f].
| ︙ | ︙ | |||
142 143 144 145 146 147 148 149 150 151 152 153 154 155 |
(let ((res (read-file fname read)))
(if (null? res)
(begin
(print "ERROR: file " fname " is malformed for read")
#f)
(car res))))
;; Write an sxml gnumeric workbook to a refdb directory structure.
;;
(define (extract-refdb dat targdir)
(create-directory (conc targdir "/sxml") #t)
(let* ((wrkbk (find-section dat 'http://www.gnumeric.org/v10.dtd:Workbook))
(wrk-rem (remove-section dat 'http://www.gnumeric.org/v10.dtd:Workbook))
(sheets (find-section wrkbk 'http://www.gnumeric.org/v10.dtd:Sheets))
| > > > > > > > > > > > > > | 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 |
(let ((res (read-file fname read)))
(if (null? res)
(begin
(print "ERROR: file " fname " is malformed for read")
#f)
(car res))))
(define (replace-sheet-name-index indat sheets)
(let* ((rem-dat (remove-section indat 'http://www.gnumeric.org/v10.dtd:SheetNameIndex))
(one-sht (find-section rem-dat 'http://www.gnumeric.org/v10.dtd:SheetName)) ;; for the future if I ever decide to do this "right"
(mk-entry (lambda (sheet-name)
(append '(http://www.gnumeric.org/v10.dtd:SheetName
(@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
(http://www.gnumeric.org/v10.dtd:Cols "256")))
(list sheet-name))))
(new-indx-values (map mk-entry sheets)))
(append rem-dat (list (cons 'http://www.gnumeric.org/v10.dtd:SheetNameIndex
new-indx-values)))))
;; Write an sxml gnumeric workbook to a refdb directory structure.
;;
(define (extract-refdb dat targdir)
(create-directory (conc targdir "/sxml") #t)
(let* ((wrkbk (find-section dat 'http://www.gnumeric.org/v10.dtd:Workbook))
(wrk-rem (remove-section dat 'http://www.gnumeric.org/v10.dtd:Workbook))
(sheets (find-section wrkbk 'http://www.gnumeric.org/v10.dtd:Sheets))
|
| ︙ | ︙ | |||
194 195 196 197 198 199 200 201 202 203 204 |
(hash-table-fold ht (lambda (k v res)(if (equal? v val) k res)) #f))
(define (read-dat fname)
(let ((section-rx (regexp "^\\[(.*)\\]\\s*$"))
(comment-rx (regexp "^#.*")) ;; This means a cell name cannot start with #
(cell-rx (regexp "^(\\S+) (.*)$")) ;; One space only for the cellname content separator
(blank-rx (regexp "^\\s*$"))
(inp (open-input-file fname))
(cmnt-indx (make-hash-table))
(blnk-indx (make-hash-table)))
(let loop ((inl (read-line inp))
| > > | > > > > | 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 |
(hash-table-fold ht (lambda (k v res)(if (equal? v val) k res)) #f))
(define (read-dat fname)
(let ((section-rx (regexp "^\\[(.*)\\]\\s*$"))
(comment-rx (regexp "^#.*")) ;; This means a cell name cannot start with #
(cell-rx (regexp "^(\\S+) (.*)$")) ;; One space only for the cellname content separator
(blank-rx (regexp "^\\s*$"))
(continue-rx (regexp ".*\\\\$"))
(var-no-val-rx (regexp "^(\\S+)\\s*$"))
(inp (open-input-file fname))
(cmnt-indx (make-hash-table))
(blnk-indx (make-hash-table)))
(let loop ((inl (read-line inp))
(section ".............")
(res '()))
(if (eof-object? inl)
(begin
(close-input-port inp)
(reverse res))
(regex-case
inl
(continue-rx _ (loop (conc inl (read-line inp)) section res))
(comment-rx _ (let ((curr-indx (+ 1 (hash-table-ref/default cmnt-indx section 0))))
(hash-table-set! cmnt-indx section curr-indx)
(loop (read-line inp)
section
(cons (list (conc "#CMNT" curr-indx) section inl) res))))
(blank-rx _ (let ((curr-indx (+ 1 (hash-table-ref/default blnk-indx section 0))))
(hash-table-set! blnk-indx section curr-indx)
(loop (read-line inp)
section
(cons (list (conc "#BLNK" curr-indx) section " ") res))))
(section-rx (x sname) (loop (read-line inp)
sname
res))
(cell-rx (x k v) (loop (read-line inp)
section
(cons (list k section v) res)))
(var-no-val-rx (x k) (loop (read-line inp)
section
(cons (list k section "") res)))
(else (begin
(print "ERROR: Unrecognised line in input file " fname ", ignoring it")
(loop (read-line inp) section res))))))))
(define (get-value-type val expressions)
(cond
((string->number val) '(ValueType "40"))
|
| ︙ | ︙ | |||
490 491 492 493 494 495 496 |
(if (not (file-exists? "megatest.config")) ;; must be at top of Megatest area
(begin
(print "ERROR: Must be at top of Megatest area to edit")
(exit)))
(create-directory ".refdb/sxml" #t)
(if (not (file-exists? ".refdb/sxml/_workbook.sxml"))
(sxml->file workbook-meta ".refdb/sxml/_workbook.sxml"))
| < < > > > | | | | > > | 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 |
(if (not (file-exists? "megatest.config")) ;; must be at top of Megatest area
(begin
(print "ERROR: Must be at top of Megatest area to edit")
(exit)))
(create-directory ".refdb/sxml" #t)
(if (not (file-exists? ".refdb/sxml/_workbook.sxml"))
(sxml->file workbook-meta ".refdb/sxml/_workbook.sxml"))
(file-copy "megatest.config" ".refdb/megatest.dat" #t)
(make-sheet-meta-if-needed ".refdb/sxml/megatest.sxml")
(file-copy "runconfigs.config" ".refdb/runconfigs.dat" #t)
(make-sheet-meta-if-needed ".refdb/sxml/runconfigs.sxml")
(let ((testnames '()))
(for-each (lambda (tdir)
(let* ((testname (pathname-strip-directory tdir))
(tconfig (conc tdir "/testconfig"))
(metafile (conc ".refdb/sxml/" testname ".sxml")))
(if (file-exists? tconfig)
(begin
(set! testnames (append testnames (list testname)))
(file-copy tconfig (conc ".refdb/" testname ".dat") #t)
(make-sheet-meta-if-needed metafile)))))
(glob "tests/*"))
(let ((sheet-names (append (list "megatest" "runconfigs") testnames)))
(if (not (file-exists? ".refdb/sxml/_sheets.sxml"))
(sxml->file (replace-sheet-name-index sheets-meta sheet-names) ".refdb/sxml/_sheets.sxml"))
(with-output-to-file ".refdb/sheet-names.cfg"
(lambda ()
(map print sheet-names))))))
(let ((dotfile (conc (get-environment-variable "HOME") "/.txtdbrc")))
(if (file-exists? dotfile)
(load dotfile)))
(main)
#|
(define x (refdb:read-gnumeric-xml "testdata-stripped.xml"))
|
| ︙ | ︙ |