Index: configf.scm
==================================================================
--- configf.scm
+++ configf.scm
@@ -83,21 +83,22 @@
(poststr (list-ref matchdat 4))
(result #f)
(start-time (current-seconds))
(cmdsym (string->symbol cmdtype))
(fullcmd (case cmdsym
- ((scheme)(conc "(lambda (ht)" cmd ")"))
- ((system)(conc "(lambda (ht)(system \"" cmd "\"))"))
- ((shell) (conc "(lambda (ht)(shell \"" cmd "\"))"))
- ((getenv)(conc "(lambda (ht)(get-environment-variable \"" cmd "\"))"))
- ((get)
+ ((scheme scm) (conc "(lambda (ht)" cmd ")"))
+ ((system) (conc "(lambda (ht)(system \"" cmd "\"))"))
+ ((shell sh) (conc "(lambda (ht)(shell \"" cmd "\"))"))
+ ((realpath rp)(conc "(lambda (ht)(common:nice-path \"" cmd "\"))"))
+ ((getenv) (conc "(lambda (ht)(get-environment-variable \"" cmd "\"))"))
+ ((get g)
(let* ((parts (string-split cmd))
(sect (car parts))
(var (cadr parts)))
(conc "(lambda (ht)(config-lookup ht \"" sect "\" \"" var "\"))")))
- ((runconfigs-get) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
- ((rget) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
+ ((runconfigs-get rget) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
+ ;; ((rget) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
(else "(lambda (ht)(print \"ERROR\") \"ERROR\")"))))
;; (print "fullcmd=" fullcmd)
(handle-exceptions
exn
(begin
Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -739,11 +739,11 @@
;; Add db direct
;;
(define (db:dispatch-query access-mode rmt-cmd db-cmd . params)
(if (eq? access-mode 'cached)
- (print "not doing cached calls right now"))
+ (debug:print 2 *default-log-port* "not doing cached calls right now"))
;; (apply db:call-with-cached-db db-cmd params)
(apply rmt-cmd params))
;;)
;; return the target db handle so it can be used
@@ -3055,23 +3055,26 @@
(set! row-ids (cons rid row-ids)))
runsqry)
(sqlite3:finalize! runsqry)
row-ids))
+;; finds latest matching all patts for given run-id
+;;
(define (db:test-get-paths-matching-keynames-target-new dbstruct run-id keynames target res testpatt statepatt statuspatt runname)
(let* ((testqry (tests:match->sqlqry testpatt))
- (tstsqry (conc "SELECT rundir FROM tests WHERE " testqry " AND state LIKE '" statepatt "' AND status LIKE '" statuspatt "' ORDER BY event_time ASC;")))
+ (tstsqry (conc "SELECT rundir FROM tests WHERE run_id=? AND " testqry " AND state LIKE '" statepatt "' AND status LIKE '" statuspatt "' ORDER BY event_time ASC;")))
(db:with-db
dbstruct
run-id
#f
(lambda (db)
(sqlite3:for-each-row
(lambda (p)
(set! res (cons p res)))
db
- tstsqry)
+ tstsqry
+ run-id)
res))))
(define (db:test-toplevel-num-items dbstruct run-id testname)
(db:with-db
dbstruct
Index: docs/manual/megatest_manual.html
==================================================================
--- docs/manual/megatest_manual.html
+++ docs/manual/megatest_manual.html
@@ -1,10 +1,10 @@
-
+
The Megatest Users Manual