Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -74,11 +74,10 @@ # CKPATH=$(shell dirname $(shell dirname $(CSIPATH))) # ARCHSTR=$(shell uname -m)_$(shell uname -r) # BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE") # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr) ARCHSTR=$(shell if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi) -# ARCHSTR=$(shell bash -c "echo \$$MACHTYPE") PNGFILES = $(shell cd docs/manual;ls *png) # all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut tcmt @@ -316,23 +315,23 @@ utils/mk_wrapper $(PREFIX) dboard $(PREFIX)/bin/dashboard chmod a+x $(PREFIX)/bin/dashboard $(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so : lib/libpangox-1.0.so - if [[ $(ARCHSTR) == 12.5 ]]; then \ + @if [[ $(ARCHSTR) == 12.5 ]]; then \ mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib; \ $(INSTALL) lib/libpangox-1.0.so $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so; \ fi $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so.0 : lib/libpangox-1.0.so.0 - if [[ $(ARCHSTR) == 12.5 ]]; then \ + @if [[ $(ARCHSTR) == 12.5 ]]; then \ mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib; \ $(INSTALL) lib/libpangox-1.0.so.0 $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so.0; \ fi $(PREFIX)/bin/.$(ARCHSTR)/lib/libxcb-xlib.so.0 : lib/libxcb-xlib.so.0 - if [[ $(ARCHSTR) == 12.5 ]]; then \ + @if [[ $(ARCHSTR) == 12.5 ]]; then \ mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib; \ $(INSTALL) lib/libxcb-xlib.so.0 $(PREFIX)/bin/.$(ARCHSTR)/lib/libxcb-xlib.so.0; \ fi install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \ Index: dashboard-new-runs-view.scm ================================================================== --- dashboard-new-runs-view.scm +++ dashboard-new-runs-view.scm @@ -67,20 +67,25 @@ (lambda () (dashboard:new-runs-updater commondat tabdat rdat)) tab-num: tab-num) (iup:split #:orientation "VERTICAL" - #:value 150 + #:value 10 (iup:vbox (dboard:runs-tree-new-view-browser commondat rdat)) (iup:split #:orientation "VERTICAL" - #:value 250 + #:value 10 (iup:vbox (dboard:runs-new-matrix commondat rdat)) - (iup:vbox - (iup:matrix)))))) + (iup:hbox + (iup:split + #:orientation "VERTICAL" + #:value 10 + (dboard:runs-new-matrix commondat rdat) + (dboard:test-info-matrix commondat rdat) + )))))) (define (dashboard:new-runs-updater commondat tabdat rdat) (let* ((runnum (dboard:rdat-runnum rdat)) (start-time (current-milliseconds)) (tot-runs #f)) @@ -142,20 +147,86 @@ (define (dboard:runs-new-matrix commondat rdat) (iup:matrix #:alignment1 "ALEFT" ;; #:expand "YES" ;; "HORIZONTAL" #:scrollbar "YES" - #:numcol 10 - #:numlin 20 - #:numcol-visible 5 ;; (min 8) + #:numcol 100 + #:numlin 200 + #:numcol-visible 3 ;; (min 8) #:numlin-visible 1 + #:widthdef 20 #:click-cb (lambda (obj row col status) (let* ((cell (conc row ":" col))) #f)) )) - + +;; run info, test info +(define (dboard:test-info-matrix commondat rdat) + (let* ((run-fields + '(("Run Info" . 1) + ("Fields" . 2) + ("Target" . 3) + ("Runname" . 4) + ("Run-id" . 5) + ("Run-date" . 6))) + (test-fields + '(("Test Info" . 1) + ("Testname" . 2) + ("Item path" . 3) + ("State" . 4) + ("Status" . 5) + ("Comment" . 6) + ("Test-id" . 7) + ("Test-date" . 8))) + (test-meta-fields + '(("Test Meta Data" . 1) + ("Author" . 2) + ("Owner" . 3) + ("Reviewed" . 4) + ("Tags" . 5) + ("Description" . 6))) + (remhost-run-info-fields + '(("Remote host/Run info" . 1) + ("Hostname" . 2) + ("Disk free" . 3) + ("CPU Load" . 4) + ("Run duration" . 5) + ("Logfile" . 6) + ("Process ID" . 7) + ("Machine info" . 8))) + (mk-matrix (lambda (cfgdat) + (let ((mtx (iup:matrix + #:alignment1 "ALEFT" + ;; #:expand "YES" ;; "HORIZONTAL" + #:scrollbar "YES" + #:numcol 1 + #:numlin (length cfgdat) + #:numcol-visible 1 ;; (min 8) + #:numlin-visible 1 + #:widthdef 50 + #:click-cb + (lambda (obj row col status) + (let* ((cell (conc row ":" col))) + #f))))) + (for-each (lambda (finfo) + (match finfo + ((fieldname . rownum) + (iup:attribute-set! mtx (conc rownum":0") fieldname)) + (else (debug:print 0 *default-log-port* "ERROR: bad finfo "finfo)))) + cfgdat) + mtx))) + (runmtx (mk-matrix run-fields)) + (testmtx (mk-matrix test-fields)) + (metamtx (mk-matrix test-meta-fields)) + (remhostmtx (mk-matrix remhost-run-info-fields))) + (iup:vbox + (iup:hbox + runmtx testmtx) + (iup:hbox + metamtx remhostmtx)))) + ;; browse runs as a tree. Used in both "Runs" tab and ;; in the runs control panel. ;; ;; THIS IS THE NEW ONE ;; Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -24,11 +24,12 @@ (import (prefix iup iup:)) (use canvas-draw) (import canvas-draw-iup) (use ducttape-lib) -(use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors) ;; defstruct +(use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors + matchable) ;; defstruct (import (prefix sqlite3 sqlite3:)) (declare (uses common)) (declare (uses margs)) (declare (uses keys))