@@ -21,19 +21,23 @@
 
 [tests-paths]
 1 #{get misc parent}/simplerun/tests
 
 [setup]
+
+# put monitor.db in MT_RUN_AREA_HOME/db
+monitordir #{getenv MT_RUN_AREA_HOME}/db
+
+# set the dbdir to /var/tmp/$USER/mt_db, default is linktree
+dbdir /var/tmp/#{getenv USER}/mt_db
+
 # Set launchwait to no to use the more agressive code that does not wait for the launch to complete before proceeding
 # this may save a few milliseconds on launching tests
 # launchwait no
 waivercommentpatt ^WW\d+ [a-z].*
 incomplete-timeout 1
 
-# set the dbdir, default is linktree
-dbdir #{getenv MT_RUN_AREA_HOME}/db/
-
 # wait for runs to completely complete. yes, anything else is no
 run-wait yes
 
 # If set to "default" the old code is used. Otherwise defaults to 200 or uses
 # numeric value given.
@@ -207,14 +211,14 @@
 # Within the archive the data is structured like this:
 #  <target>/<runname>/<test>/
 disk0 /tmp/#{getenv USER}/adisk1
 
 # Uncomment these to emulate a job queue with a long time (look in bin/sleeprunner for the time)
-[jobtools]
-launcher #{scheme (case (string->symbol (conc (getenv "datapath"))) \
-                     ((none) "nbfake") \
-                     ((openlava) "bsub") \
-                     (else "sleeprunner"))}
-
-launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log 
+# [jobtools]
+# launcher #{scheme (case (string->symbol (conc (getenv "datapath"))) \
+#                      ((none) "nbfake") \
+#                      ((openlava) "bsub") \
+#                      (else "sleeprunner"))}
+# 
+# launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log