@@ -8,23 +8,56 @@
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 ;;======================================================================
 
 (declare (unit genexample))
+(use posix)
+
+(define genexample:example-logpro
+#<<EOF
+;; You should have at least one expect:required. This ensures that your process ran
+(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
+
+;; You may need ignores to suppress false error or warning hits from the later expects
+;; NOTE: Order is important here!
+(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
+(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
+(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors
+EOF
+)
+
+(define genexample:example-script
+#<<EOF
+#!/usr/bin/env bash
 
+# Run your step here
+EOF
+)
 
-(define (genexample:mk-megatest.config path)
+(define (genexample:mk-megatest.config)
   (let ((keystr #f)
 	(keys   #f)
 	(lntree #f)
+	(path   #f)
 	(firstd #f))
-    (debug:print 0 "Note: don't worry too much about typos in this process, you will be able to edit
+    (print "Note: don't worry too much about typos in this process, you will be able to edit
 the generated files before starting your first runs")
 
+    ;; create the needed area
+    (print "==================\nWhere can I create your Megatest regresssion/continuous build area? Note, your \n"
+	   "tests will not necessarily be run in this area, disk space needs are modest.")
+    (display "Enter your megatest directory: ")
+    (set! path (read-line))
+
+    (if (not (directory? path))
+	(begin
+	  (print "The path " path " does not exist or is not a directory. Attempting to create it now")
+	  (create-directory path #t)))
+
     ;; first prompt user for fields
     ;;
-    (debug:print 0 "First you must specify fields or keys for your megatest area. These will 
+    (print "==================\nNext you must specify fields or keys for your megatest area. These will 
 be used to organise your runs. One field should probably be \"RELEASE\". 
 Other examples of useful fields might be \"PLATFORM\", \"TARGET_OS\" or if you are in the
 semiconductor business perhaps things like \"TECHNOLOGY_NODE\", \"DESIGN_KIT\" or \"METAL_STACK\".
 
 The all caps is a convention because the variables you choose will be available to your tests
@@ -33,29 +66,167 @@
 your keys. Example, if you have keys OSFAMILY/VARIANT/OSVER/RELEASE you may get a test \"build\"
 in a directory like this: linux/ubuntu/11.04/rev_1.2/build
 
 Please enter your keys now, separated by spaces or slashes. Only alpha-numeric characters. 
 Upper case recommended.")
+    (display "Enter keys separated by spaces or slashes: ")
     (set! keystr (read-line))
     (set! keys   (apply append
 			(map string-split (string-split keystr "/"))))
     
     ;; Now get the link tree location and a first disk
-    (debug:print 0 "Now you need an initial place to store your runs. These are called \"disks\" and you
+    (print "==================\nNow you need an initial place to store your runs. These are called \"disks\" and you
 can add more at any time. To get going provide a writeable directory name. ")
+    (display "Enter your test runs directory: ")
     (set! firstd (read-line))
+    (if (not (directory? firstd))
+	(begin
+	  (print "WARNING: you have specified a path " firstd " that does not exist. Attempting to create it...\n")
+	  (create-directory firstd #t)))
 
-    (debug:print 0 "Megatest uses a tree of symlinks to provide a uniform structure for finding all the tests
+    (print "==================\nMegatest uses a tree of symlinks to provide a uniform structure for finding all the tests
 you run over time. Please provide a path where we can create this link tree.")
+    (display "Enter link tree directory: ")
     (set! lntree (read-line))
-    
-    (with-output-to-file 
-	(lambda ()
-	  (print "[fields]")
-	  (map (lambda (k)(print k " TEXT")) keys)
-	  (print "")
-	  (print "[setup]")
-	  (print "# Adjust max_concurrent_jobs to limit how much you load your machines")
-	  (print "max_concurrent_jobs 50\n")
-	  (print "# This is your link path, you can move it but it is generally better to keep it stable")
-	  (print "linktree " lntree)
-	  (print "")))))
+    (if (not (directory? lntree))
+	(begin
+	  (print "WARNING: you have specified a path " lntree "that does not exist. Attempting to create it...\n")
+	  (create-directory lntree #t)))
+    
+    (with-output-to-file (conc path "/megatest.config")
+      (lambda ()
+	(print "[fields]")
+	(map (lambda (k)(print k " TEXT")) keys)
+	(print "")
+	(print "[setup]")
+	(print "# Adjust max_concurrent_jobs to limit how much you load your machines")
+	(print "max_concurrent_jobs 50\n")
+	(print "# This is your link path, you can move it but it is generally better to keep it stable")
+	(print "linktree " lntree)
+	(print "\n# Job tools are more advanced ways to control how your jobs are launched")
+	(print "[jobtools]\nuseshell yes\nlauncher nbfind\n")
+	(print "# You can override environment variables for all your tests here")
+	(print "[env-override]\nEXAMPLE_VAR example value\n")
+	(print "# As you run more tests you may need to add additional disks, the names are arbitrary but must be unique")
+	(print "[disks]\ndisk0 " firstd)))
+
+    (print "==================\nI'm now creating a runconfigs.config file for you with a default section.
+You can use this file to set variables for your tests based on the \"target\" (the combination
+of keys).")
+    (with-output-to-file (conc path "/runconfigs.config")
+      (lambda ()
+	(print "# The variables in the default category will be seen in all runs\n[default]\nALLTESTS see this variable\n")
+	
+	(print "# Your variables here are grouped by targets [" (string-intersperse keys "/") "]")
+	(let ((example-target (string-intersperse (map (lambda (k)(conc k "_val")) keys) "/")))
+	  (print "[" example-target "]")
+	  (print "ANOTHERVAR only defined if target is " example-target))))
+
+    ;; Now create a test and logpro file
+    (print "You now have the basic common files for your megatest setup. Next run \"megatest -gentest\"\n"
+	   "to create a test.\n\nThanks for using Megatest. You can edit your config files and create tests\n"
+	   "in the " path " directory")))
+
+
+;;======================================================================
+;; create skeleton files for a test
+;;======================================================================
+
+(define (genexample:mk-megatest-test testname)
+  ;; Gather needed data
+  (let ((waiton   #f)
+	(priority #f)
+	(description #f)
+	(steps    '())
+	(scripts  '())
+	(items    '())
+	(rel-path #f))
+    (print "We are going to generate a skeleton set of files for your test " testname " Note: do not worry "
+	   "too much about typos, you can edit the files when you are done")
+
+    (print "==================\nPlease describe this test. The description will be visible in various dialogs and reports")
+    (display "Enter one line description for this test: ")
+    (set! description (read-line))
+
+    (print "==================\nDoes this test, " testname ", require any other test be run prior to launch?")
+    (display (conc "Enter space delimited list of tests which " testname " must wait for: "))
+    (set! waiton (read-line))
+
+    (print "==================\nDo you wish to prioritize the running of this test over other tests? If so")
+    (print "enter a number greater than zero here")
+    (display "Enter a priority of 0 (default) or higher: ")
+    (set! priority (read-line))
+
+    ;; Get the steps
+    (print "==================\nNow to enter the one or more steps that make up your test, note; you can add more later")
+    (print "Hint; use .sh extension on the script names and we'll create placeholder scripts."
+
+    (let ((stepname   #f)
+	  (scriptname #f))
+      (let loop ((done #f))
+	(display "Enter the name for this step (blank to stop): ")
+	(set! stepname (read-line))
+	(if (not (equal? stepname ""))
+	    (begin
+	      (display "Enter the script or progam to run: ")
+	      (set! scriptname (read-line))
+	      (set! steps (append steps (list (list stepname scriptname))))))
+	(if (not (equal? stepname ""))
+	    (loop #f))))
+
+    ;; Get the items
+    (print "==================\nNext we need to get the variables and values you wish to iterate this test over (blank for none)")
+    (let ((varname #f)
+	  (values  #f))
+      (let loop ((done #f))
+	(display "Enter the variable name: ")
+	(set! varname (read-line))
+	(if (not (equal? varname ""))
+	    (begin
+	      (display (conc "Enter the space separated list of values for " varname ": "))
+	      (set! values (read-line))
+	      (set! items (append items (list (conc varname " " values))))))
+	(if (not (equal? varname ""))
+	    (loop #f))))
+
+    ;; Now create the test
+    (cond
+     ((file-exists? "megatest.config")         (set! rel-path "./"))
+     ((file-exists? "../megatest.config")      (set! rel-path "../"))
+     ((file-exists? "../../megatest.config")   (set! rel-path "../../"))
+     ((file-exists? "../../../megatest.config")(set! rel-path "../../../"))) ;; good enough dang it.
+    (if (not rel-path)
+	(begin
+	  (print "ERROR: You must run this command in a megatest area under where the megatest.config file exists.")
+	  (exit 1))
+	(let ((testdir (conc rel-path "tests/" testname)))
+	  (create-directory testdir #t)
+	  (with-output-to-file (conc testdir "/testconfig")
+	    (lambda ()
+	      (print "# Add additional steps here. Format is \"stepname script\"\n[ezsteps]")
+	      (map (lambda (stp)(print (string-intersperse stp " "))) steps)
+	      (print "")
+	      (print "# Test requirements are specified here\n[requirements]")
+	      (print "waiton " waiton)
+	      (print "priority " priority "\n")
+	      (print "# Iteration for your tests are controlled by the items section\n[items]")
+	      (map print items)
+	      (print "")
+	      (print "# test_meta is a section for storing additional data on your test\n[test_meta]")
+	      (print "author " (get-environment-variable "USER"))
+	      (print "owner  " (get-environment-variable "USER"))
+	      (print "description " description)
+	      (print "tags tagone,tagtwo")
+	      (print "reviewed never")))
+	  ;; Now create shell scripts (if extension is .sh) and logpro files
+	  (for-each (lambda (stp)
+		      (let ((stepname (car stp))
+			    (script   (cadr stp)))
+			(with-output-to-file (conc testdir "/" stepname ".logpro")
+			  (lambda ()
+			    (print genexample:example-logpro)))
+			(with-output-to-file (conc testdir "/" script ".sh")
+			  (lambda ()
+			    (print genexample:example-script)))
+			(system (conc "chmod ug+r " (conc testdir "/" script ".sh")))))
+		    steps))))))
+	  ;;