Index: .mtutil.scm ================================================================== --- .mtutil.scm +++ .mtutil.scm @@ -61,7 +61,7 @@ (hash-table-set! *runname-mappers* 'auto (lambda (target run-name area area-path reason contour mode-patt) "auto-eh")) -(print "Got here!") +;; (print "Got here!") Index: megatest.config ================================================================== --- megatest.config +++ megatest.config @@ -8,14 +8,15 @@ [areas] # path-to-area map-target-script(future, optional) fullrun path=tests/fullrun # targtrans is name of scheme proc stored in .mtutil.scm, which lives in PWD where mtutil is run -ext-tests path=ext-tests; targtrans=prefix-contour; +# ext-tests path=ext-tests; targtrans=prefix-contour; +ext-tests path=ext-tests [contours] # mode-patt/tag-expr quick selector=QUICKPATT/quick -full areas=fullrun,ext-tests; selector=MAXPATT/all +full areas=fullrun,ext-tests; selector=MAXPATT/ all areas=fullrun,ext-tests snazy areas=%; selector=QUICKPATT/ Index: mtut.scm ================================================================== --- mtut.scm +++ mtut.scm @@ -28,14 +28,10 @@ (require-library stml) (define *target-mappers* (make-hash-table)) ;; '()) (define *runname-mappers* (make-hash-table)) ;; '()) -(let ((debugcontrolf (conc (get-environment-variable "HOME") "/.mtutilrc"))) - (if (file-exists? debugcontrolf) - (load debugcontrolf))) - ;; this needs some thought regarding security implications. ;; ;; i. Check that owner of the file and calling user are same? ;; ii. Check that we are in a legal megatest area? ;; iii. Have some form of authentication or record of the md5sum or similar of the file? @@ -393,11 +389,13 @@ (let* ((sched (cond ((vector? sched-in)(local-time->seconds sched-in)) ;; we recieved a time ((number? sched-in) sched-in) (else (current-seconds)))) (args-data (if args-alist - args-alist + (if (hash-table? args-alist) ;; seriously? + (hash-table->alist args-alist) + args-alist) (hash-table->alist args:arg-hash))) ;; if no args-alist then we assume this is a call driven directly by commandline (alldat (apply append (list 'T "cmd" 'a action 'U (current-user-name) 'D sched) @@ -883,10 +881,14 @@ (define (get-pkts-dir mtconf) (let ((pktsdirs (configf:lookup mtconf "setup" "pktsdirs")) (pktsdir (if pktsdirs (car (string-split pktsdirs " ")) #f))) pktsdir)) +(let ((debugcontrolf (conc (get-environment-variable "HOME") "/.mtutilrc"))) + (if (file-exists? debugcontrolf) + (load debugcontrolf))) + (if *action* (case (string->symbol *action*) ((run remove rerun set-ss archive kill) (let* ((mtconfdat (simple-setup (args:get-arg "-start-dir"))) (mtconf (car mtconfdat)) @@ -937,11 +939,10 @@ ;; (if (get-environment-variable "HTTP_HOST") (begin (stml:main #f) (exit))) - (if (or (args:get-arg "-repl") (args:get-arg "-load")) (begin (import extras) ;; might not be needed