Index: tests.scm ================================================================== --- tests.scm +++ tests.scm @@ -778,10 +778,11 @@ (hash-table-set! (hash-table-ref/default resh test-name #f) test-item (make-hash-table))) (hash-table-set! (hash-table-ref/default (hash-table-ref/default resh test-name #f) test-item #f) run-id (list test-status test-html-path)))) test-data))) runs) resh)) + ;; tests:genrate dashboard body ;; (define (tests:dashboard-body page pg-size keys numkeys total-runs linktree area-name get-prev-links get-next-links flag run-patt target-patt) @@ -792,11 +793,11 @@ (header (vector-ref runsdat 0)) (runs (vector-ref runsdat 1)) (ctr 0) (test-runs-hash (tests:get-rest-data runs header numkeys)) (test-list (hash-table-keys test-runs-hash))) - (print header ) + (s:html tests:css-jscript-block (tests:css-jscript-block-cond flag) (s:title "Summary for " area-name) (s:body 'onload "addEvents();" (get-prev-links page linktree) (get-next-links page linktree total-runs) @@ -803,10 +804,11 @@ (s:h1 "Summary for " area-name) (s:h3 "Filter" ) (s:input 'type "text" 'name "testname" 'id "testname" 'length "30" 'onkeyup "filtersome()") ;; top list + (s:table 'id "LinkedList1" 'border "1" 'cellspacing 0 (map (lambda (key) (let* ((res (s:tr 'class "something" (s:th key ) (map (lambda (run) @@ -829,19 +831,19 @@ (s:td item-name 'class "test" ) (map (lambda (run) (let* ((run-test (hash-table-ref/default item-hash item-name #f)) (run-id (db:get-value-by-header run header "id")) (result (hash-table-ref/default run-test run-id "n/a")) - (relative-path (get-relative-path)) + ;(relative-path (get-relative-path)) (status (if (string? result) result (car result))) (link (if (string? result) result (if (equal? flag #t) (s:a (car result) 'href (conc "./test_log?runid=" run-id "&testname=" item-name )) - (s:a (car result) 'href (cadr result)))))) + (s:a (car result) 'href (string-substitute (conc linktree "/") "" (cadr result) "-")))))) (s:td link 'class status))) runs)))) res)) item-keys))) test-list)))))) @@ -853,16 +855,16 @@ (runs-to-process '()) (linktree (common:get-linktree)) (area-name (common:get-testsuite-name)) (keys (rmt:get-keys)) (numkeys (length keys)) - (run-patt (if (args:get-arg "-run-patt") - (args:get-arg "-run-patt") + (run-patt (or (args:get-arg "-run-patt") + (args:get-arg "-runname") "%")) - (target (if (args:get-arg "-target-patt") - (args:get-arg "-target-patt") - "%")) + (target (or (args:get-arg "-target-patt") + (args:get-arg "-target") + "%")) (targlist (string-split target "/")) (numtarg (length targlist)) (targtweaked (if (> numkeys numtarg) (append targlist (make-list (- numkeys numtarg) "%")) targlist)) @@ -875,19 +877,19 @@ ;(print total-runs) (let loop ((page 0)) (let* ((oup (open-output-file (or outf (conc linktree "/page" page ".html")))) (get-prev-links (lambda (page linktree ) (let* ((link (if (not (eq? page 0)) - (s:a "<<prev" 'href (conc linktree "/page" (- page 1) ".html")) - (s:a "" 'href (conc linktree "/page" page ".html"))))) + (s:a "<<prev" 'href (conc "page" (- page 1) ".html")) + (s:a "" 'href (conc "page" page ".html"))))) link))) (get-next-links (lambda (page linktree total-runs) (let* ((link (if (> total-runs (+ 10 (* page pg-size))) - (s:a "next>>" 'href (conc linktree "/page" (+ page 1) ".html")) - (s:a "" 'href (conc linktree "/page" page ".html"))))) + (s:a "next>>" 'href (conc "page" (+ page 1) ".html")) + (s:a "" 'href (conc "page" page ".html"))))) link))) ) - ;(print "total runs: " total-runs) + (print "total runs: " total-runs) (s:output-new oup (tests:dashboard-body page pg-size keys numkeys total-runs linktree area-name get-prev-links get-next-links #f run-patt target-patt)) ;; update this function (close-output-port oup) ; (set! page (+ 1 page)) @@ -975,15 +977,15 @@ (define (tests:create-html-summary outf) (let* ((lockfile (conc outf ".lock")) (linktree (common:get-linktree)) (keys (rmt:get-keys)) (area-name (common:get-testsuite-name)) - (run-patt (if (args:get-arg "-run-patt") - (args:get-arg "-run-patt") + (run-patt (or (args:get-arg "-run-patt") + (args:get-arg "-runname") "%")) - (target (if (args:get-arg "-target-patt") - (args:get-arg "-target-patt") + (target (or (args:get-arg "-target-patt") + (args:get-arg "-target") "%")) (targlist (string-split target "/")) (numkeys (length keys)) (numtarg (length targlist)) (targtweaked (if (> numkeys numtarg) @@ -1082,12 +1084,12 @@ (map (lambda (test) (let* ((test-details (hash-table-ref/default test-hash test #f)) (status (if test-details (car test-details))) (link (if test-details - (cadr test-details)))) - (if test-details + (string-substitute (conc linktree "/" target "/" run-name "/") "" (cadr test-details) "-")))) + (if test-details (s:td 'class status (s:a 'class "link" 'href link status )) (s:td "")))) test-names)))))) (sort items string<=?)))))) @@ -1155,11 +1157,11 @@ (if (equal? run "") (s:td run) (if (file-exists?(conc linktree "/" target "/" run )) (begin (s:td - (s:a 'href (conc linktree "/" target "/" run "/run.html") run)))))) + (s:a 'href (conc target "/" run "/run.html") run)))))) (reverse runs)))) rest-row))) targets))) tbl))))) (close-output-port oup)))