Overview
Comment: | Merged filters-fix into redir-logs |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | redir-logs |
Files: | files | file ages | folders |
SHA1: |
a3957fea2df001527547370db76edaff |
User & Date: | matt on 2016-06-21 03:57:32 |
Other Links: | branch diff | manifest | tags |
Context
2016-06-21
| ||
09:57 | Switch to *default-log-port* check-in: f52cd44a6e user: mrwellan tags: redir-logs | |
04:06 | Merging first phase of redir-logs into v1.61 check-in: 1f31d511c0 user: matt tags: v1.61 | |
03:57 | Merged filters-fix into redir-logs check-in: a3957fea2d user: matt tags: redir-logs | |
2016-06-20
| ||
18:20 | Filter mostly fixed and added unit test for filter Closed-Leaf check-in: 1d19de5e2c user: mrwellan tags: filters-fix | |
2016-06-16
| ||
03:19 | Added param for overriding port to debug:print and debug:print-info check-in: 7b4d2dba0e user: matt tags: redir-logs | |
Changes
Modified Makefile from [9afa174d56] to [1879ee0391].
︙ | |||
226 227 228 229 230 231 232 233 | 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 | + + - - + + - + | chicken-install -keep-installed $(PROXY) -deploy -prefix sretrieve defstruct srfi-18 format sql-de-lite \ srfi-1 posix regex regex-case srfi-69 # base64 dot-locking \ # csv-xml z3 # "(define (toplevel-command . a) #f)" # if egrep 'version.*3.0' $(shell dirname $(shell dirname $(shell which csi)))/lib/chicken/7/readline.setup-info;then \ readline-fix.scm : |
︙ |
Modified common.scm from [261ac8fc27] to [a4b65729f6].
︙ | |||
150 151 152 153 154 155 156 | 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 | + + - + + + + + + + + + + - + + + + - + - - - - + + + + + - - - - - - - + + + + + + + + + + | (define (common:set-last-run-version) (rmt:set-var "MEGATEST_VERSION" (common:version-signature))) (define (common:version-changed?) (not (equal? (common:get-last-run-version) (common:version-signature)))) ;; Move me elsewhere ... ;; |
︙ |
Modified dashboard.scm from [5c3e41317b] to [98198ca4ab].
︙ | |||
386 387 388 389 390 391 392 | 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 | - + - | (allruns (if (d:alldat-useserver data) (rmt:get-runs runnamepatt numruns (d:alldat-start-run-offset data) keypatts) (db:get-runs (d:alldat-dblocal data) runnamepatt numruns ;; (+ numruns 1) ;; (/ numruns 2)) (d:alldat-start-run-offset data) keypatts))) (header (db:get-header allruns)) (runs (db:get-rows allruns)) (result '()) |
︙ | |||
1602 1603 1604 1605 1606 1607 1608 | 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 | - + | ;; (iup:attribute-set! obj "TITLE" (if (d:alldat-hide-not-hide data) "HideTests" "NotHide")) (iup:attribute-set! hide "BGCOLOR" sel-color) (iup:attribute-set! show "BGCOLOR" nonsel-color) (mark-for-update)))) (set! show (iup:button "Show" #:expand "YES" #:action (lambda (obj) |
︙ |
Modified db.scm from [dc2e8d07f3] to [be67a32d7b].
︙ | |||
2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 | 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 | + + + + - + + + + + + + + - + + + - + | (if (eq? mode 'dashboard) " IN ('" (if not-in " NOT IN ('" " IN ('") ) (string-intersperse statuses "','") "')"))) (interim-qry (conc " AND " (if not-in "NOT " "") "( state='COMPLETED' " (if statuses-qry (conc " AND " statuses-qry " ) ") " ) ") (if states-qry (conc (if not-in " AND " " OR ") states-qry ) ;; " ) ") ""))) (states-statuses-qry (cond ((and states-qry statuses-qry) (case mode |
︙ | |||
2285 2286 2287 2288 2289 2290 2291 | 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 | - - - - - - - | db "SELECT run_id,testname,item_path,state,status FROM tests WHERE id=?;" test-id))) res)) ;; get a useful subset of the tests data (used in dashboard ;; use db:mintest-get-{id ,run_id,testname ...} |
︙ |
Modified megatest.scm from [00c2b290ae] to [ca4fb834f0].
︙ | |||
1824 1825 1826 1827 1828 1829 1830 | 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 | - - - - - - - - - - - - + - | (if (args:get-arg "-cleanup-db") (begin (if (not (launch:setup)) (begin (debug:print 0 #f "Failed to setup, exiting") (exit 1))) |
︙ | |||
1898 1899 1900 1901 1902 1903 1904 | 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 | + + + + + - - - - + + + + | (set! *client-non-blocking-mode* #t) (import extras) ;; might not be needed ;; (import csi) (import readline) (import apropos) ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ... (include "readline-fix.scm") (if *use-new-readline* (begin (install-history-file (get-environment-variable "HOME") ".megatest_history") ;; [homedir] [filename] [nlines]) (current-input-port (make-readline-port "megatest> "))) (begin |
︙ |
Modified rmt.scm from [25f95b044e] to [28f40eaf71].
︙ | |||
388 389 390 391 392 393 394 | 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 | - + | (define (rmt:set-tests-state-status run-id testnames currstate currstatus newstate newstatus) (rmt:send-receive 'set-tests-state-status run-id (list run-id testnames currstate currstatus newstate newstatus))) (define (rmt:get-tests-for-run run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode) (if (number? run-id) (rmt:send-receive 'get-tests-for-run run-id (list run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)) (begin |
︙ |
Modified runs.scm from [eab39cb46c] to [2ce0f7497c].
︙ | |||
1324 1325 1326 1327 1328 1329 1330 | 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 | - + | (loop))))) (if (not testdat) ;; should NOT happen (debug:print 0 #f "ERROR: failed to get test record for test-id " test-id)) (set! test-id (db:test-get-id testdat)) (if (file-exists? test-path) (change-directory test-path) (begin |
︙ |
Modified sretrieve.scm from [60f6da50e2] to [4335bf3320].
︙ | |||
54 55 56 57 58 59 60 61 62 63 64 65 66 67 | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | + | (define sretrieve:help (conc "Usage: " *exe-name* " [action [params ...]] ls : list contents of target area get <relversion> : retrieve data for release <version> -m \"message\" : why retrieved? cp <relative path> : copy file to current directory log : get listing of recent downloads shell : start a shell-like interface Part of the Megatest tool suite. Learn more at http://www.kiatoa.com/fossils/megatest Version: " megatest-fossil-hash)) ;; " ;;====================================================================== |
︙ | |||
409 410 411 412 413 414 415 416 417 418 419 420 421 422 | 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | #f (loop (car tal)(cdr tal))))))) (define (sretrieve:stderr-print . args) (with-output-to-port (current-error-port) (lambda () (apply print args)))) ;;====================================================================== ;; SHELL ;;====================================================================== (define (toplevel-command . args) #f) (define (sretrieve:shell) (use readline) (let* ((path '()) (prompt "> ") (top-areas '("mrwellan" "pjhatwal" "bjbarcla" "ritikaag" "jmoon18")) (iport (make-readline-port prompt))) (install-history-file) ;; [homedir] [filename] [nlines]) (with-input-from-port iport (lambda () (let loop ((inl (read-line))) (if (not (or (eof-object? inl) (equal? inl "exit"))) (let* ((parts (string-split inl)) (cmd (if (null? parts) #f (car parts)))) (if (not cmd) (loop (read-line)) (case (string->symbol cmd) ((cd) (if (> (length parts) 1) ;; have a parameter (set! path (append path (string-split (cadr parts)))) ;; not correct for relative paths (set! path '()))) ((ls) (let* ((thepath (if (> (length parts) 1) ;; have a parameter (cdr parts) path)) (plen (length thepath))) (cond ((null? thepath) (print (string-intersperse top-areas " "))) ((and (< plen 2) (member (car thepath) top-areas)) (system (conc "ls /p/fdk/gwa/" (car thepath)))) (else ;; have a long path ;; check for access rights here (system (conc "ls /p/fdk/gwa/" (string-intersperse thepath "/"))))))) (else (print "Got command: " inl)))) (loop (read-line))))))))) ;;====================================================================== ;; MAIN ;;====================================================================== (define (sretrieve:load-config exe-dir exe-name) (let* ((fname (conc exe-dir "/." exe-name ".config"))) |
︙ | |||
556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 | 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 | + + | ((log) (sretrieve:db-do configdat (lambda (db) (print "Logs : ") (query (for-each-row (lambda (row) (apply print (intersperse row " | ")))) (sql db "SELECT * FROM actions"))))) ((shell) (sretrieve:shell)) (else (print "ERROR: Unrecognised command. Try \"sretrieve help\"")))) ;; multi-word commands ((null? rema)(print sretrieve:help)) ((>= (length rema) 2) (apply sretrieve:process-action configdat (car rema)(cdr rema))) (else (debug:print 0 #f "ERROR: Unrecognised command. Try \"sretrieve help\""))))) (main) |
Modified tests/unittests/basicserver.scm from [f2f7d0aa9d] to [85fa769c5b].
1 2 3 4 5 6 7 8 9 10 11 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | - + | ;;====================================================================== ;; S E R V E R ;;====================================================================== ;; Run like this: ;; ;; ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0) (delete-file* "logs/1.log") (define run-id 1) |
︙ | |||
177 178 179 180 181 182 183 | 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 | - + | ;; ;; ;; Not sure how the following should work, replacing it with system of megatest -server ;; ;; (test "launch server" #t (let ((pid (process-fork (lambda () ;; ;; ;; (daemon:ize) ;; ;; (server:launch 'http))))) ;; ;; (set! server-pid pid) ;; ;; (number? pid))) |
︙ |
Modified tests/unittests/tests.scm from [15fd3688ae] to [936d866cb6].
| 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + |
|