@@ -235,18 +235,18 @@
 
 # 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") \
-                         ((sleeprunner) "sleeprunner")
+                         ((openlava) "bsub -o $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.log") \
+                         ((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
+# launcher nbfake
 
 [configf:settings trim-trailing-spaces yes]
 
 # Override the rollup for specific tests
 [testrollup]
@@ -257,11 +257,11 @@
 VAL1 Foo    
 VAL2 ==>#{get test VAL1}Bar<== no spaces between Foo and Bar to pass
 
 ltest #{scheme (case (string->symbol (conc (getenv "datapath"))) \
                         ((none) "nbfake") \
-                        ((openlava) "bsub") \
+                        ((openlava) "bsub -o $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.log") \
                         (else "sleeprunner"))}
 
 #================================================================
 # Flexi-launcher
 #================================================================
@@ -286,12 +286,13 @@
 
 [jobtools]
 flexi-launcher yes
 
 [host-types]
-general nbfake
+general bsub
+alt     #{get jobtools launcher}
+local   nbfake
 remote  #{get jobtools launcher}
-# remote  nbfake
 
 [launchers]
 runfirst/sum% remote
 %             general