Index: dashboard-tests.scm ================================================================== --- dashboard-tests.scm +++ dashboard-tests.scm @@ -247,11 +247,11 @@ ;;====================================================================== ;; ;;====================================================================== (define (examine-test db test-id) ;; run-id run-key origtest) - (let* ((testdat (db:get-test-data-by-id db test-id)) + (let* ((testdat (rdb:get-test-data-by-id db test-id)) (run-id (if testdat (db:test-get-run_id testdat) #f)) (keydat (if testdat (keys:get-key-val-pairs db run-id) #f)) (rundat (if testdat (db:get-run-info db run-id) #f)) (runname (if testdat (db:get-value-by-header (db:get-row rundat) (db:get-header rundat) Index: db.scm ================================================================== --- db.scm +++ db.scm @@ -1117,5 +1117,13 @@ (let ((host (vector-ref *runremote* 0)) (port (vector-ref *runremote* 1))) ((rpc:procedure 'rpc:test-set-log! host port) run-id test-name item-path logf)) (db:test-set-log! db run-id test-name item-path logf))) + +(define (rdb:get-test-data-by-id db test-id) + (if *runremote* + (let ((host (vector-ref *runremote* 0)) + (port (vector-ref *runremote* 1))) + ((rpc:procedure 'rpc:get-test-data-by-id host port) + test-id)) + (db:get-test-data-by-id db test-id))) Index: runs.scm ================================================================== --- runs.scm +++ runs.scm @@ -411,11 +411,12 @@ (new-test-name (if (equal? item-path "") test-name (conc test-name "/" item-path))) ;; just need it to be unique (testdat (db:get-test-info db run-id test-name item-path))) (if (not testdat) (begin ;; ensure that the path exists before registering the test - (system (conc "mkdir -p " new-test-path)) + ;; NOPE: Cannot! Don't know yet which disk area will be assigned.... + ;; (system (conc "mkdir -p " new-test-path)) (register-test db run-id test-name item-path) (set! testdat (db:get-test-info db run-id test-name item-path)))) (change-directory test-path) (case (if force ;; (args:get-arg "-force") 'NOT_STARTED Index: server.scm ================================================================== --- server.scm +++ server.scm @@ -9,11 +9,12 @@ ;; PURPOSE. (require-extension (srfi 18) extras tcp rpc) (import (prefix rpc rpc:)) -(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo) +(use sqlite3 srfi-1 posix regex regex-case srfi-69) +;; (use hostinfo) (import (prefix sqlite3 sqlite3:)) (declare (unit server)) (declare (uses common)) @@ -93,10 +94,15 @@ (rpc:publish-procedure! 'rpc:test-set-log! (lambda (run-id test-name item-path logf) (db:test-set-log! db run-id test-name item-path logf))) + + (rpc:publish-procedure! + 'rpc:get-test-data-by-id + (lambda (test-id) + (db:get-test-data-by-id db test-id))) (set! *rpc:listener* rpc:listener) (on-exit (lambda () (sqlite3:execute db "DELETE FROM metadat WHERE var='SERVER' and val=?;" host:port) (sqlite3:finalize! db))) Index: tests/Makefile ================================================================== --- tests/Makefile +++ tests/Makefile @@ -3,13 +3,14 @@ BINPATH=$(shell realpath ../bin) MEGATEST=$(BINPATH)/megatest PATH := $(BINPATH):$(PATH) runall : - cd ../;make install + cd ../;make install + mkdir -p /tmp/mt_runs /tmp/mt_links $(BINPATH)/dboard -rows 15 & - $(MEGATEST) -keepgoing -runall -target ubuntu/nfs/none :runname `date +w%V.%u.%H` -m "This is a comment specific to a run" -v + $(MEGATEST) -runall -target ubuntu/nfs/none :runname `date +w%V.%u.%H` -m "This is a comment specific to a run" -v test : csi -b -I .. ../megatest.scm -- -runall -target ubuntu/afs/tmp :runname blah cd ../;make test make runall Index: tests/megatest.config ================================================================== --- tests/megatest.config +++ tests/megatest.config @@ -4,11 +4,11 @@ datapath TEXT [setup] # exectutable /path/to/megatest max_concurrent_jobs 50 -linktree /tmp/runs +linktree /tmp/mt_links [jobtools] # useshell yes # ## launcher launches jobs, the job is managed on the target host ## by megatest, comment out launcher to run local @@ -39,6 +39,6 @@ ## disks are: ## name host:/path/to/area ## -or- ## name /path/to/area [disks] -1 /tmp +1 /tmp/mt_runs