Overview
| Comment: | Refactor code that choose transport. Priorities between options were not handled correctly in the three contexts; commandline override, cmdinfo and megatest.config |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.55 |
| Files: | files | file ages | folders |
| SHA1: |
d29828129b33fc91fc133b42197a29df |
| User & Date: | matt on 2013-08-04 21:56:13 |
| Other Links: | branch diff | manifest | tags |
Context
|
2013-08-05
| ||
| 00:19 | Made all stages respect the same hierarchy in setting transport. If -runtests uses http, so should test internal calls check-in: d42aaaab5b user: matt tags: v1.55 | |
|
2013-08-04
| ||
| 21:56 | Refactor code that choose transport. Priorities between options were not handled correctly in the three contexts; commandline override, cmdinfo and megatest.config check-in: d29828129b user: matt tags: v1.55 | |
| 21:21 | Cleaned up auto server start a little check-in: 166fac4584 user: matt tags: v1.55 | |
Changes
Modified megatest.scm from [958ed9b034] to [a185db2b11].
| ︙ | ︙ | |||
327 328 329 330 331 332 333 | (begin ;; 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 | | | > > > > > > > | > > | | > > | > > | | > > > > > > > | 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 |
(begin
;; 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
(let ((transport-from-config (configf:lookup *configdat* "setup" "transport"))
(transport-from-cmdln (args:get-arg "-transport"))
(transport-from-cmdinfo (if (getenv "MT_CMDINFO")
(assoc 'transport
(read (open-input-string (base64:base64-decode
(getenv "MT_CMDINFO")))))
#f)))
(cond
;; command line overrides other mechanisms
(transport-from-cmdln
(if (equal? transport-from-cmdln "fs")
(set! *transport-type* 'fs)
(begin
(server:ensure-running)
(client:launch))))
;; cmdinfo is second priority
(transport-from-cmdinfo
(if (equal? transport-from-cmdinfo "fs")
(set! *transport-type* 'fs)
(begin
(server:ensure-running)
(client:launch))))
;; config file is next highest priority for determinining transport
(transport-from-config
(if (equal? transport-from-config "fs")
(set! *transport-type* 'fs)
(begin
(server:ensure-running)
(client:launch))))
(else
(set! *transport-type* 'fs)))))))))
(if (or (args:get-arg "-list-servers")
(args:get-arg "-stop-server"))
(let ((tl (setup-for-run)))
(if tl
|
| ︙ | ︙ | |||
1068 1069 1070 1071 1072 1073 1074 |
(args:get-arg "-load"))
(let* ((toppath (setup-for-run))
(db (if toppath (open-db) #f)))
(if db
(begin
(set! *db* db)
(set! *client-non-blocking-mode* #t)
| < < | 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 |
(args:get-arg "-load"))
(let* ((toppath (setup-for-run))
(db (if toppath (open-db) #f)))
(if db
(begin
(set! *db* db)
(set! *client-non-blocking-mode* #t)
(import readline)
(import apropos)
(gnu-history-install-file-manager
(string-append
(or (get-environment-variable "HOME") ".") "/.megatest_history"))
(current-input-port (make-gnu-readline-port "megatest> "))
(if (args:get-arg "-repl")
|
| ︙ | ︙ |