@@ -358,11 +358,11 @@ "-stop-server" "-show-cmdinfo" "-list-runs"))) (if (setup-for-run) (begin - + (set! *fdb* (filedb:open-db (conc *toppath* "/db/paths.db"))) ;; if not list or kill then start a client (if appropriate) (if (or (args-defined? "-h" "-version" "-gen-megatest-area" "-gen-megatest-test") (eq? (length (hash-table-keys args:arg-hash)) 0)) (debug:print-info 1 "Server connection not needed") ;; ok, so lets connect to the server @@ -384,12 +384,10 @@ (case chosen-transport ((http) (set! *transport-type 'http) (server:ensure-running) ;; Get rid of this - (set! sdb:qry (make-sdb:qry (conc *toppath* "/db/strings.db"))) ;; we open the normalization helpers here - (set! *fdb* (filedb:open-db (conc *toppath* "/db/paths.db"))) (client:launch)) (else ;; (fs) (debug:print 0 "ERROR: Should NOT be getting here! fs transport is no longer supported") (set! *transport-type* 'fs) @@ -618,11 +616,12 @@ (equal? (db:test-get-state test) "NOT_STARTED"))) (begin (print " cpuload: " (db:test-get-cpuload test) "\n diskfree: " (db:test-get-diskfree test) "\n uname: " (sdb:qry 'getstr (db:test-get-uname test)) - "\n rundir: " (filedb:get-path *fdb* (db:test-get-rundir test)) + "\n rundir: " (sdb:qry 'getstr ;; (filedb:get-path *fdb* + (db:test-get-rundir test)) ) ;; Each test ;; DO NOT remote run (let ((steps (db:get-steps-for-test dbstruct run-id (db:test-get-id test)))) (for-each @@ -1196,11 +1195,11 @@ ;; (if (and *runremote* ;; (socket? *runremote*)) ;; (close-socket *runremote*)) (if sdb:qry (sdb:qry 'finalize #f)) -(if *fdb* (filedb:finalize-db! *fdb*)) +;; (if *fdb* (filedb:finalize-db! *fdb*)) (if (not *didsomething*) (debug:print 0 help)) ;; (if *runremote* (rpc:close-all-connections!))