@@ -111,14 +111,10 @@ ;; imports common to chk5 and ck4 (import srfi-13) (include "db_records.scm") -(define (common:get-fields cfgdat) - (let ((fields (hash-table-ref/default cfgdat "fields" '()))) - (map car fields))) - ;;====================================================================== ;; stuff from keys that can't be in commonmod. Maybe move all from commonmod to here? ;;====================================================================== (define (keys:make-key/field-string confdat) @@ -126,15 +122,26 @@ (string-join (map (lambda (field)(conc (car field) " " (cadr field))) fields) ","))) -(define keys:config-get-fields common:get-fields) - ;;====================================================================== ;; testsuite and area utilites ;;====================================================================== + +(define (common:get-linktree) + (or (getenv "MT_LINKTREE") + (if *configdat* + (configf:lookup *configdat* "setup" "linktree") + #f) + (if (or *toppath* (getenv "MT_RUN_AREA_HOME")) + (conc (or *toppath* (getenv "MT_RUN_AREA_HOME")) "/lt") + #f) + (let* ((tp (common:get-toppath #f)) + (lt (conc tp "/lt"))) + (if (not tp)(debug:print 0 *default-log-port* "WARNING: cannot calculate best path for linktree, using " lt)) + lt))) (define (get-testsuite-name toppath configdat) (or (lookup configdat "setup" "area-name") (lookup configdat "setup" "testsuite") (get-environment-variable "MT_TESTSUITE_NAME")