Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -339,10 +339,13 @@
 
 $(PREFIX)/bin/mt-new-to-old.sh : utils/mt-new-to-old.sh
 	$(INSTALL) $< $@
 	chmod a+x $@
 
+$(PREFIX)/bin/convert-db.sh : utils/convert-db.sh
+	$(INSTALL) $< $@
+	chmod a+x $@
 
 deploytarg/nbfake : utils/nbfake
 	$(INSTALL) $< $@
 	chmod a+x $@
 
@@ -385,10 +388,11 @@
 
 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/mtrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \
           $(PREFIX)/bin/mt-old-to-new.sh $(PREFIX)/bin/mt-new-to-old.sh \
+          $(PREFIX)/bin/convert-db.sh $(PREFIX)/bin/convert-db.sh \
 	  $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun \
 	  $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun $(PREFIX)/bin/mtutil \
 	  $(PREFIX)/share/db/mt-pg.sql \
           $(PREFIX)/share/js/jquery-3.1.0.slim.min.js \
           $(PREFIX)/bin/.$(ARCHSTR)/lib/libpangox-1.0.so \

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -374,10 +374,55 @@
        (match logprodat
 	      ((name content)
 	       (debug:print-info 2 *default-log-port* "Creating logpro file "(current-directory)"/"name".logpro")
 	       (with-output-to-file (conc name".logpro")
 		 (lambda ()
+		   (print content)
+		   ;; (change-file-mode name (bitwise-ior perm/irwxg perm/irwxu))
+		   )))
+	      (else
+	       (debug:print-info 0 "Invalid logpro definiton found in [logpro] section of testconfig. \"" logprodat "\""))))
+     logpros)))
+
+;; read testconfig and create .logpro and script files
+;;    - use #f for tconfigreg to re-read the testconfigs from disk
+;;
+(define (launch:extract-scripts-logpro  test-dir test-name item-path tconfigreg-in)
+  (let* ((tconfigreg      (or tconfigreg-in
+			      (tests:get-all)))
+	 (tconfig-fname   (conc test-dir "/.testconfig"))
+	 (tconfig-tmpfile (conc tconfig-fname ".tmp"))
+	 (tconfig         (tests:get-testconfig test-name item-path tconfigreg #t force-create: #t)) ;; 'return-procs)))
+	 (scripts         (configf:get-section tconfig "scripts"))
+	 (logpros         (configf:get-section tconfig "logpro")))
+    ;; create .testconfig file
+    (configf:write-alist tconfig tconfig-tmpfile)
+    (file-move tconfig-tmpfile tconfig-fname #t)
+    (delete-file* ".final-status")
+    
+    ;; extract scripts from testconfig and write them to files in test run dir
+    (for-each
+     (lambda (scriptdat)
+       (match scriptdat
+	      ((name content)
+	       (debug:print-info 2 *default-log-port* "Creating script "(current-directory)"/"name)
+	       (with-output-to-file name
+		 (lambda ()
+		   (print content)))
+	       (change-file-mode name (bitwise-ior perm/irwxg perm/irwxu)))
+	      (else
+	       (debug:print-info 0 "Invalid script definiton found in [scripts] section of testconfig. \"" scriptdat "\""))))
+     scripts)
+
+    ;; extract logpro from testconfig and write them to files in test run dir
+    (for-each
+     (lambda (logprodat)
+       (match logprodat
+	      ((name content)
+	       (debug:print-info 2 *default-log-port* "Creating logpro file "(current-directory)"/"name)
+	       (with-output-to-file name
+		 (lambda ()
 		   (print content)
 		   ;; (change-file-mode name (bitwise-ior perm/irwxg perm/irwxu))
 		   )))
 	      (else
 	       (debug:print-info 0 "Invalid logpro definiton found in [logpro] section of testconfig. \"" logprodat "\""))))

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -265,11 +265,10 @@
   -debug N|N,M,O...       : enable debug 0-N or N and M and O ...
   -debug-noprop N|M,M,O...: enable debug but do not propagate to subprocesses via MT_DEBUG
   -config fname           : override the megatest.config file with fname
   -append-config fname    : append fname to the megatest.config file
   -import-sexpr fname     : import a sexpr file (use -list-runs % -dumpmode sexpr to create)
-  -remove-dbs all         : remove Megatest DBs before importing sexpr. (Use only with -import-sexpr)
   -regen-testfiles        : regenerate scripts and logpro files from testconfig, run in test context
   
 Utilities
   -env2file fname         : write the environment to fname.csh and fname.sh
   -envcap a               : save current variables labeled as context 'a' in file envdat.db
@@ -2132,10 +2131,25 @@
 		  (paths    (tests:test-get-paths-matching keys target (args:get-arg "-test-files"))))
 	     (for-each (lambda (path)
 			 (print path))
 		       paths))))))
 
+;;======================================================================
+;; Utils for test areas
+;;======================================================================
+
+(if (args:get-arg "-regen-testfiles")
+    (if (getenv "MT_TEST_RUN_DIR")
+	(begin
+	  (launch:setup)
+	  (change-directory (getenv "MT_TEST_RUN_DIR"))
+	  (let* ((testname (getenv "MT_TEST_NAME"))
+		 (itempath (getenv "MT_ITEMPATH")))
+	    (launch:extract-scripts-logpro (getenv "MT_TEST_RUN_DIR") testname itempath #f))
+	  (set! *didsomething* #t))
+	(debug:print 0 *default-log-port* "ERROR: Must run -regen-testfiles in a test environment (i.e. test xterm from dashboard)")))
+		 	  
 ;;======================================================================
 ;; Utils for test areas
 ;;======================================================================
 
 (if (args:get-arg "-regen-testfiles")

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -393,11 +393,11 @@
 		      (set! new-server-key (with-input-from-file start-flag (lambda () (read-line))))
 		      (equal? server-key new-server-key)))
 	       #t
                ;; If either of the above conditions is not true, print a "Gating server start" message, wait <idle-time> + 1, then call this function recursively. 
 	       (begin
-		 (debug:print-info 0 *default-log-port* "Gating server start, last start: "
+		 (debug:print-info 2 *default-log-port* "Gating server start, last start: "
 				   (seconds->time-string fmodtime) ", time since last start: " delta ", required idletime: " idletime ", gating reason:" (if old-enough "another job started a server" "too soon to start another server"))
 		 
 		 (thread-sleep! ( + 1 idletime))
 		 (server:wait-for-server-start-last-flag areapath)))))))
 

ADDED   utils/convert-db.sh
Index: utils/convert-db.sh
==================================================================
--- /dev/null
+++ utils/convert-db.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+if [ -z "megatest.config" ]; then
+    echo "The file 'megatest.config' does not exist. This must be run in a megatest area."
+    exit 1
+fi
+if [ -d ".mtdb" ]; then
+    echo "The .mtdb directory already exists. Will not do the conversion"
+    exit 1
+fi
+if [ -d ".megatest" ]; then
+    echo "Found a .megatest directory. Will convert from megatest 1.70 to 1.71/1.80 format"
+    /p/foundry/env/pkgs/megatest/1.70/16/bin/megatest -list-runs % -dumpmode sexpr > data.sexpr
+else 
+    if [ -f "megatest.db" ]; then
+        echo "Found megatest.db. Will convert from megatest 1.65 to 1.71/1.80 format"
+        /p/foundry/env/pkgs/megatest/1.65/92/bin/megatest -list-runs % -dumpmode sexpr > data.sexpr
+    else
+        echo "Did not find .megatest or megatest.db. Cannot do the conversion"
+        exit 1
+    fi
+fi
+which megatest
+megatest -import-sexpr data.sexpr
+