@@ -232,14 +232,15 @@
 #  <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 #{scheme (case (string->symbol (conc (getenv "datapath"))) \
+                         ((none) "nbfake") \
+                         ((openlava) "bsub") \
+                         ((sleeprunner) "sleeprunner")
+                         (else "nbfake"))}
 
 # launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log 
 
 # launcher #{shell if which bsub > /dev/null;then echo bsub -q priority -o openlava.log;else echo sleeprunner;fi}
 launcher nbfake
@@ -285,11 +286,11 @@
 [jobtools]
 flexi-launcher yes
 
 [host-types]
 general nbfake
-remote  bsub
+remote  #{get jobtools launcher}
 # remote  nbfake
 
 [launchers]
 runfirst/sum% remote
-% general
+%             general