Index: trunk/ippTasks/simtest.pro
===================================================================
--- trunk/ippTasks/simtest.pro	(revision 17592)
+++ trunk/ippTasks/simtest.pro	(revision 17593)
@@ -2,6 +2,6 @@
 
 macro simtest
-  if ($0 != 4)
-    echo "USAGE: simtest (dbname) (hostname) (init)"
+  if ($0 != 5)
+    echo "USAGE: simtest (testroot) (dbname) (hostname) (init)"
     echo " if (init) == 0, just run the analysis tasks"
     echo " if (init) == 1, (re)create the database and (re)inject the images"
@@ -10,8 +10,9 @@
   end
 
-  $dbname = $1
-  $hostname = $2
+  $testroot = $1
+  $dbname = $2
+  $hostname = $3
  
-  if ($3 > 0)
+  if ($4 > 0)
     # XXX this will fail and exit the script if the db does not exist or is old...
     exec pxadmin -delete -dbname $dbname
@@ -20,12 +21,12 @@
     exec pxadmin -create -dbname $dbname
 
-    if ($3 == 2)
+    if ($4 == 2)
       # the labels "wait" and "proc" are special names used in automate.pro
-      exec ppSimSequence basic.simtest.config basic.simtest.mkimages basic.simtest.inject -path raw -workdir work -dbname $dbname -label wait
-      exec source basic.simtest.mkimages
+      exec ppSimSequence $MODULES:0/$testroot.config $testroot.mkimages $testroot.inject -path raw -workdir work -dbname $dbname -label wait
+      exec source $testroot.mkimages
     end
 
     exec chiptool -dbname $dbname -block -label wait
-    exec source basic.simtest.inject
+    exec source $testroot.inject
   end