Index: db.scm ================================================================== --- db.scm +++ db.scm @@ -967,10 +967,11 @@ ;;====================================================================== ;; Misc. test related queries ;;====================================================================== +;; MUST BE CALLED local! (define (db:test-get-paths-matching db keynames target fnamepatt #!key (res '())) (let ((paths-from-db (cdb:remote-run db:test-get-paths-matching-keynames-target db keynames target res))) (if fnamepatt (apply append (map (lambda (p) Index: launch.scm ================================================================== --- launch.scm +++ launch.scm @@ -82,10 +82,11 @@ (if (and (file-exists? fulln) (file-execute-access? fulln)) fulln runscript))))) ;; assume it is on the path (rollup-status 0)) + (change-directory top-path) (debug:print 2 "Exectuing " test-name " (id: " test-id ") on " (get-host-name)) ;; Setup the *runremote* global var (if *runremote* (debug:print 2 "ERROR: I'm not expecting *runremote* to be set at this time")) ;; (set! *runremote* runremote) (set! *transport-type* (string->symbol transport)) @@ -109,11 +110,11 @@ (setenv "MT_ITEM_INFO" (conc itemdat)) (setenv "MT_RUNNAME" runname) (setenv "MT_MEGATEST" megatest) (setenv "MT_TARGET" target) (if mt-bindir-path (setenv "PATH" (conc (getenv "PATH") ":" mt-bindir-path))) - (change-directory top-path) + ;; (change-directory top-path) (if (not (setup-for-run)) (begin (debug:print 0 "Failed to setup, exiting") ;; (sqlite3:finalize! db) ;; (sqlite3:finalize! tdb) Index: megatest-version.scm ================================================================== --- megatest-version.scm +++ megatest-version.scm @@ -1,7 +1,7 @@ ;; Always use two digit decimal ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00.. (declare (unit megatest-version)) -(define megatest-version 1.53) +(define megatest-version 1.5301) Index: megatest.scm ================================================================== --- megatest.scm +++ megatest.scm @@ -139,16 +139,19 @@ "-execute" ;; run the command encoded in the base64 parameter "-step" ":runname" "-target" "-reqtarg" - ":item" - ":runname" + ":runname" + "-runname" ":state" + "-state" ":status" + "-status" "-list-runs" "-testpatt" + "-itempatt" "-setlog" "-set-toplog" "-runstep" "-logpro" "-m" @@ -240,10 +243,16 @@ (if (args:get-arg "-logging")(set! *logging* #t)) (if (debug:debug-mode 3) ;; we are obviously debugging (set! open-run-close open-run-close-no-exception-handling)) +(if (args:get-arg "-itempatt") + (let ((newval (conc (args:get-arg "-testpatt") "/" (args:get-arg "-itempatt")))) + (debug:print 0 "WARNING: -itempatt has been deprecated, please use -testpatt testpatt/itempatt method, new testpatt is "newval) + (hash-table-set! args:arg-hash "-testpatt" newval) + (hash-table-delete! args:arg-hash "-itempatt"))) + ;;====================================================================== ;; Misc general calls ;;====================================================================== (if (args:get-arg "-env2file") Index: tests/Makefile ================================================================== --- tests/Makefile +++ tests/Makefile @@ -1,8 +1,8 @@ # run some tests -BINPATH=$(shell realpath ../bin) +BINPATH=$(PWD)/../bin MEGATEST=$(BINPATH)/megatest PATH := $(BINPATH):$(PATH) RUNNAME := $(shell date +w%V.%u.%H.%M) IPADDR := "-" # Set SERVER to "-server -" Index: tests/fullrun/runconfigs.config ================================================================== --- tests/fullrun/runconfigs.config +++ tests/fullrun/runconfigs.config @@ -1,6 +1,9 @@ [include #{getenv MT_RUN_AREA_HOME}/common_runconfigs.config] + +# #{system echo 'VACKYVAR #{shell pwd}' > $MT_RUN_AREA_HOME/config/$USER.config} +[include ./config/#{getenv USER}.config] WACKYVAR0 #{get ubuntu/nfs/none CURRENT} WACKYVAR1 #{scheme (args:get-arg "-target")} [default/ubuntu/nfs] Index: tests/fullrun/tests/test_mt_vars/testconfig ================================================================== --- tests/fullrun/tests/test_mt_vars/testconfig +++ tests/fullrun/tests/test_mt_vars/testconfig @@ -12,10 +12,13 @@ # ALT_VAR should NOT be set altvarnotset altvarnotset.sh # EMPTY_VAR should be an empty string empty_var empty_var.sh + +# VACKYVAR should be set to a path +vackyvar vackyvar.sh # test-path and test-file test-path test-path-file.sh [requirements] ADDED tests/fullrun/tests/test_mt_vars/vackyvar.sh Index: tests/fullrun/tests/test_mt_vars/vackyvar.sh ================================================================== --- /dev/null +++ tests/fullrun/tests/test_mt_vars/vackyvar.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +grep VACKYVAR megatest.sh | grep fullrun