Index: http-transport.scm ================================================================== --- http-transport.scm +++ http-transport.scm @@ -183,11 +183,15 @@ ;; ;; 1 Hello, world! Goodbye Dolly ;; 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 (caddr serverdat)) ;; (conc url "/ctrl")) ;; (conc url "/?dat=" msg))) + (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)) Index: tests/fdktestqa/fdk.config ================================================================== --- tests/fdktestqa/fdk.config +++ tests/fdktestqa/fdk.config @@ -2,11 +2,11 @@ SYSTEM TEXT RELEASE TEXT [setup] # Adjust max_concurrent_jobs to limit how much you load your machines -max_concurrent_jobs 500 +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] Index: tests/fdktestqa/testqa/Makefile ================================================================== --- tests/fdktestqa/testqa/Makefile +++ tests/fdktestqa/testqa/Makefile @@ -5,10 +5,11 @@ 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 : Index: tests/fullrun/tests/blocktestxz/testconfig ================================================================== --- tests/fullrun/tests/blocktestxz/testconfig +++ tests/fullrun/tests/blocktestxz/testconfig @@ -6,12 +6,12 @@ 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. +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 Index: tests/fullrun/tests/ez_exit2_fail/testconfig ================================================================== --- tests/fullrun/tests/ez_exit2_fail/testconfig +++ tests/fullrun/tests/ez_exit2_fail/testconfig @@ -5,11 +5,11 @@ 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 +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 Index: tests/fullrun/tests/ezlog_fail_then_pass/testconfig ================================================================== --- tests/fullrun/tests/ezlog_fail_then_pass/testconfig +++ tests/fullrun/tests/ezlog_fail_then_pass/testconfig @@ -4,10 +4,10 @@ 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. +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 Index: tests/fullrun/tests/manual_example/testconfig ================================================================== --- tests/fullrun/tests/manual_example/testconfig +++ tests/fullrun/tests/manual_example/testconfig @@ -5,9 +5,9 @@ # 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. +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 Index: tests/fullrun/tests/runfirst/testconfig ================================================================== --- tests/fullrun/tests/runfirst/testconfig +++ tests/fullrun/tests/runfirst/testconfig @@ -15,10 +15,10 @@ TOCK 1 2 [test_meta] author matt owner bob -description This test must +description This test must\ be run before the other tests tags first,single reviewed 1/1/1965 Index: txtdb/nada3/First_Sheet.dat ================================================================== --- txtdb/nada3/First_Sheet.dat +++ txtdb/nada3/First_Sheet.dat @@ -1,6 +1,7 @@ [Time] +BLANKVAL A 0.32430555555555557 B 0.33124999999999999 C 0.3347222222222222 D 0.33680555555555558 E 0.33888888888888891 Index: txtdb/txtdb.scm ================================================================== --- txtdb/txtdb.scm +++ txtdb/txtdb.scm @@ -144,10 +144,23 @@ (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)) @@ -196,22 +209,25 @@ (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 #f) + (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)))) @@ -224,10 +240,13 @@ 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) @@ -492,12 +511,10 @@ (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")) - (if (not (file-exists? ".refdb/sxml/_sheets.sxml")) - (sxml->file sheets-meta ".refdb/sxml/_sheets.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 '())) @@ -509,15 +526,20 @@ (begin (set! testnames (append testnames (list testname))) (file-copy tconfig (conc ".refdb/" testname ".dat") #t) (make-sheet-meta-if-needed metafile))))) (glob "tests/*")) - (with-output-to-file ".refdb/sheet-names.cfg" - (lambda () - (map print (append (list "megatest" "runconfigs") testnames)))))) + (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) #|