Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -80,11 +80,11 @@
                             fields category,variable,value,comment
 
 Queries
   -list-runs patt         : list runs matching pattern \"patt\", % is the wildcard
   -showkeys               : show the keys used in this megatest setup
-  -test-paths targpatt    : get the most recent test path(s) matching targpatt e.g. %/%... 
+  -test-path targpatt    : get the most recent test path(s) matching targpatt e.g. %/%... 
                             returns list sorted by age ascending, see examples below
 
 Misc 
   -rebuild-db             : bring the database schema up to date
   -update-meta            : update the tests metadata for all tests
@@ -100,16 +100,14 @@
   -pathmod path           : insert path, i.e. path/runame/itempath/logfile.html
                             will clear the field if no rundir/testname/itempath/logfile
                             if it contains forward slashes the path will be converted
                             to windows style
 
-Helpers (these only apply in test run mode)
-
 Examples
 
-# Get test paths 
-megatest -test-paths -target ubuntu/n%/no% :runname w49% -testpatt test_mt%
+# Get test path, the '.' is required, could use '*' or a specific path/file
+megatest -test-path . -target ubuntu/n%/no% :runname w49% -testpatt test_mt%
 
 Called as " (string-intersperse (argv) " ")))
 
 ;;  -gui                    : start a gui interface
 ;;  -config fname           : override the runconfig file with fname
@@ -171,10 +169,11 @@
 			"-repl"
 			"-lock"
 			"-unlock"
 			;; queries
 			"-test-paths" ;; get path(s) to a test, ordered by youngest first
+			"-test-path"  ;; -test-paths is deprecated
 
 			"-runall"    ;; run all tests
 			"-remove-runs"
 			"-usequeue"
 			"-rebuild-db"
@@ -446,11 +445,11 @@
 
 ;;======================================================================
 ;; Get paths to tests
 ;;======================================================================
 ;; Get test paths matching target, runname, testpatt, and itempatt
-(if (args:get-arg "-test-paths")
+(if (or (args:get-arg "-test-path")(args:get-arg "-test-paths"))
     ;; if we are in a test use the MT_CMDINFO data
     (if (getenv "MT_CMDINFO")
 	(let* ((startingdir (current-directory))
 	       (cmdinfo   (read (open-input-string (base64:base64-decode (getenv "MT_CMDINFO")))))
 	       (testpath  (assoc/default 'testpath  cmdinfo))
@@ -468,11 +467,11 @@
 	      (begin
 		(debug:print 0 "ERROR: -target is required.")
 		(exit 1)))
 	  (if (not (setup-for-run))
 	      (begin
-		(debug:print 0 "Failed to setup, giving up on -test-paths, exiting")
+		(debug:print 0 "Failed to setup, giving up on -test-path, exiting")
 		(exit 1)))
 	  (set! db (open-db))    
 	  (if (not (args:get-arg "-server"))
 	      (server:client-setup db))
 	  (let* ((itempatt (args:get-arg "-itempatt"))
@@ -483,12 +482,12 @@
 	    (for-each (lambda (path)
 			(print path))
 		      paths)))
 	;; else do a general-run-call
 	(general-run-call 
-	 "-test-paths"
-	 "Get paths to tests"
+	 "-test-path"
+	 "Get paths to test"
 	 (lambda (db target runname keys keynames keyvallst)
 	   (let* ((itempatt (args:get-arg "-itempatt"))
 		  (paths    (rdb:test-get-paths-matching db keynames target)))
 	     (for-each (lambda (path)
 			 (print path))