Index: minimt/Makefile ================================================================== --- minimt/Makefile +++ minimt/Makefile @@ -1,6 +1,6 @@ -minimt : minimt.scm db.scm setup.scm +minimt : minimt.scm db.scm setup.scm direct.scm csc minimt.scm clean : rm -rf runtest/* ADDED minimt/direct.scm Index: minimt/direct.scm ================================================================== --- /dev/null +++ minimt/direct.scm @@ -0,0 +1,10 @@ +;; direct API, call the db calls directly + +(define rmt:create-run create-run) +(define rmt:create-step create-step) +(define rmt:create-test create-test) +(define rmt:get-test-id get-test-id) +(define rmt:get-run-id get-run-id) +(define rmt:open-create-db open-create-db) +(define rmt:step-set-state-status step-set-state-status) +(define rmt:test-set-state-status test-set-state-status) Index: minimt/minimt.scm ================================================================== --- minimt/minimt.scm +++ minimt/minimt.scm @@ -9,33 +9,35 @@ ;; *numtests* => how many tests to simulate for each run ;; *numruns* => how many runs to simulate ;; (include "setup.scm") +(include "direct.scm") ;; direct db calls + ;; RUN A TEST (define (run-test dbconn run-id test-name) - (create-test dbconn run-id test-name) - (let ((test-id (get-test-id dbconn run-id test-name))) - (test-set-state-status dbconn test-id "LAUNCHED" "na") + (rmt:create-test dbconn run-id test-name) + (let ((test-id (rmt:get-test-id dbconn run-id test-name))) + (rmt:test-set-state-status dbconn test-id "LAUNCHED" "na") (thread-sleep! *launchdelay*) - (test-set-state-status dbconn test-id "RUNNING" "na") + (rmt:test-set-state-status dbconn test-id "RUNNING" "na") (for-each (lambda (step-name) - (create-step dbconn test-id step-name) + (rmt:create-step dbconn test-id step-name) (let ((step-id (get-step-id dbconn test-id step-name))) - (step-set-state-status dbconn step-id "START" -1) + (rmt:step-set-state-status dbconn step-id "START" -1) (thread-sleep! *stepdelay*) - (step-set-state-status dbconn step-id "END" 0) + (rmt:step-set-state-status dbconn step-id "END" 0) (print" STEP: " step-name " done."))) '("step1" "step2" "step3" "step4" "step5" "step6" "step7" "step8" "step9")) (print "TEST: " test-name " done.") test-id)) ;; RUN A RUN (define (run-run dbconn target run-name num-tests) - (create-run dbconn target run-name) - (let ((run-id (get-run-id dbconn target run-name))) + (rmt:create-run dbconn target run-name) + (let ((run-id (rmt:get-run-id dbconn target run-name))) (let loop ((test-num 0)) (system (conc "NBFAKE_LOG=test-" test-num "-run-id-" run-id ".log NBFAKE_HOST=" *remotehost* " nbfake minimt runtest " run-id " test-" test-num)) (if (< test-num num-tests) (loop (+ test-num 1)))))) @@ -45,11 +47,11 @@ (print "Usage: minimt [options]" " runtest run-id testname runrun target runname") (let ((cmd (car args)) - (dbconn (open-create-db *homepath* "mt.db" init-db))) + (dbconn (rmt:open-create-db *homepath* "mt.db" init-db))) (change-directory *homepath*) (case (string->symbol cmd) ((runtest) (let ((run-id (string->number (cadr args))) (test-name (caddr args)))