Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -38,11 +38,11 @@
 ARCHSTR=$(shell lsb_release -sr)
 # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")
 
 PNGFILES = $(shell cd docs/manual;ls *png)
 
-all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard 
+all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut
 
 mtest: $(OFILES) readline-fix.scm megatest.o
 	csc $(CSCOPTS) $(OFILES) megatest.o -o mtest
 
 dboard : $(OFILES) $(GOFILES) dashboard.scm
@@ -49,10 +49,13 @@
 	csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) -o dboard
 
 ndboard : newdashboard.scm $(OFILES) $(GOFILES)
 	csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard
 
+mtut: $(OFILES) readline-fix.scm mtut.o
+	csc $(CSCOPTS) $(OFILES) mtut.scm -o mtut
+
 # install documentation to $(PREFIX)/docs
 # DOES NOT REBUILD DOCS
 #
 $(PREFIX)/share/docs/megatest_manual.html : docs/manual/megatest_manual.html
 	mkdir -p $(PREFIX)/share/docs
@@ -100,10 +103,17 @@
 	$(INSTALL) ndboard $(PREFIX)/bin/.$(ARCHSTR)/ndboard
 
 $(PREFIX)/bin/newdashboard : $(PREFIX)/bin/.$(ARCHSTR)/ndboard utils/mk_wrapper
 	utils/mk_wrapper $(PREFIX) ndboard $(PREFIX)/bin/newdashboard
 	chmod a+x $(PREFIX)/bin/newdashboard
+
+$(PREFIX)/bin/.$(ARCHSTR)/mtut : mtut
+	$(INSTALL) mtut $(PREFIX)/bin/.$(ARCHSTR)/mtut
+
+$(PREFIX)/bin/mtutil : $(PREFIX)/bin/.$(ARCHSTR)/mtut utils/mk_wrapper
+	utils/mk_wrapper $(PREFIX) mtut $(PREFIX)/bin/mtutil
+	chmod a+x $(PREFIX)/bin/mtutil
 
 #$(PREFIX)/bin/.$(ARCHSTR)/mdboard : multi-dboard
 #	$(INSTALL) multi-dboard $(PREFIX)/bin/.$(ARCHSTR)/mdboard
 
 # $(PREFIX)/bin/mdboard : $(PREFIX)/bin/.$(ARCHSTR)/mdboard  utils/mk_wrapper
@@ -178,11 +188,11 @@
 	$(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard
 
 install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \
           $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \
 	  $(PREFIX)/bin/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \
-	  $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun
+	  $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun $(PREFIX)/bin/mtutil
 
 $(PREFIX)/bin/.$(ARCHSTR) : 
 	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)
 	mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib
 

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -1,6 +1,6 @@
-;; Copyright 2006-2012, Matthew Welland.
+;; Copyright 2006-2017, Matthew Welland.
 ;; 
 ;;  This program is made available under the GNU GPL version 2.0 or
 ;;  greater. See the accompanying file COPYING for details.
 ;; 
 ;;  This program is distributed WITHOUT ANY WARRANTY; without even the

ADDED   mtut.scm
Index: mtut.scm
==================================================================
--- /dev/null
+++ mtut.scm
@@ -0,0 +1,135 @@
+;; Copyright 2006-2017, Matthew Welland.
+;; 
+;;  This program is made available under the GNU GPL version 2.0 or
+;;  greater. See the accompanying file COPYING for details.
+;; 
+;;  This program is distributed WITHOUT ANY WARRANTY; without even the
+;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+;;  PURPOSE.
+
+;; (include "common.scm")
+;; (include "megatest-version.scm")
+
+;; fake out readline usage of toplevel-command
+(define (toplevel-command . a) #f)
+
+(use srfi-1 posix srfi-69 readline ;;  regex regex-case srfi-69 apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
+     srfi-18 extras format pkts) ;;  zmq extras)
+
+(declare (uses common))
+(declare (uses megatest-version))
+(declare (uses margs))
+;; (declare (uses runs))
+;; (declare (uses launch))
+;; (declare (uses server))
+;; (declare (uses client))
+;; (declare (uses tests))
+;; (declare (uses genexample))
+;; (declare (uses daemon))
+;; (declare (uses db))
+;; ;; (declare (uses dcommon))
+;; 
+;; (declare (uses tdb))
+;; (declare (uses mt))
+;; (declare (uses api))
+;; (declare (uses tasks)) ;; only used for debugging.
+;; (declare (uses env))
+;; (declare (uses diff-report))
+;; 
+;; (define *db* #f) ;; this is only for the repl, do not use in general!!!!
+
+;; (include "common_records.scm")
+;; (include "key_records.scm")
+;; (include "db_records.scm")
+;; (include "run_records.scm")
+(include "megatest-fossil-hash.scm")
+
+(let ((debugcontrolf (conc (get-environment-variable "HOME") "/.mtutilrc")))
+  (if (file-exists? debugcontrolf)
+      (load debugcontrolf)))
+
+;; Disabled help items
+;;  -rollup                 : (currently disabled) fill run (set by :runname)  with latest test(s)
+;;                            from prior runs with same keys
+
+(define help (conc "
+mtutil, part of the Megatest tool suite, documentation at http://www.kiatoa.com/fossils/megatest
+  version " megatest-version "
+  license GPL, Copyright Matt Welland 2006-2017
+
+Usage: mtutil [options]
+  -h                       : this help
+  -manual                  : show the Megatest user manual
+  -version                 : print megatest version (currently " megatest-version ")
+
+Launching and managing runs
+  -action run|remove|rerun : register action for processing
+   Actions: setss (set state/status), archive, kill (stop tests or runs)
+
+Selectors 
+  -target key1/key2/...   : run for key1, key2, etc.
+  -testpatt p1/p2,p3/...  : % is wildcard
+  -runname                : required, name for this particular test run
+  -state                  : Applies to runs, tests or steps depending on context
+  -status                 : Applies to runs, tests or steps depending on context
+  -modepatt key           : load testpatt from <key> in runconfigs instead of default TESTPATT if -testpatt and -tagexpr are not specified
+  -tagexpr tag1,tag2%,..  : select tests with tags matching expression
+
+Misc 
+  -start-dir path         : switch to this directory before running mtutil
+  -setvars VAR1=val1,VAR2=val2 : Add environment variables to a run NB// these are
+                                 overwritten by values set in config files.
+  -log logfile            : send stdout and stderr to logfile
+  -repl                   : start a repl (useful for extending megatest)
+  -load file.scm          : load and run file.scm
+  -debug N|N,M,O...       : enable debug 0-N or N and M and O ...
+
+Examples:
+
+# Start a megatest run in the area \"mytests\"
+mtutil -area mytests -action run -target v1.63/aa3e -modepatt MYPATT -tagexpr quick
+
+Called as " (string-intersperse (argv) " ") "
+Version " megatest-version ", built from " megatest-fossil-hash ))
+
+;; process args
+(define remargs (args:get-args 
+		 (argv)
+		 (list  "-run"  ;; run a specific test
+			"-target"
+			"-runname"
+			"-state"
+			"-status"
+			"-testpatt"
+                        "-modepatt"
+                        "-tagexpr"
+			"-itempatt"
+			;; misc
+			"-start-dir"
+			"-setvars"
+			"-debug" ;; for *verbosity* > 2
+			"-load"        ;; load and exectute a scheme file
+			"-log"
+			)
+ 		 (list  "-h" "-help" "--help"
+			"-manual"
+			"-version"
+			;; misc
+			"-repl"
+
+                        )
+		 args:arg-hash
+		 0))
+
+;; Add args that use remargs here
+;;
+(if (and (not (null? remargs))
+	 (not (or
+	       (args:get-arg "-runstep")
+	       (args:get-arg "-envcap")
+	       (args:get-arg "-envdelta")
+	       )
+	      ))
+    (debug:print-error 0 *default-log-port* "Unrecognised arguments: " (string-intersperse (if (list? remargs) remargs (argv))  " ")))
+
+