Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -193,15 +193,16 @@
 									 (processloop (+ i 1))))
 								   ))
 						     (teststep-set-status! db run-id test-name stepname "end" (vector-ref exit-info 2) itemdat #f (if logpro-used (conc stepname ".html") ""))
 						     (if logpro-used
 							 (test-set-log! db run-id test-name itemdat (conc stepname ".html")))
+						     (debug:print 4 "Exit value received: " (vector-ref exit-info 2) " logpro-used: " logpro-used)
 						     (cond
 						      ;; WARN from logpro
-						      ((and (eq? (vector-ref exit-info 1) 2) logpro-used)
+						      ((and (eq? (vector-ref exit-info 2) 2) logpro-used)
 						       (test-set-status! db run-id test-name "COMPLETE" "WARN" itemdat "Logpro warning found" #f))
-						      ((eq? (vector-ref exit-info 1) 0)
+						      ((eq? (vector-ref exit-info 2) 0)
 						       (test-set-status! db run-id test-name "COMPLETE" "PASS" itemdat #f #f))
 						      (else
 						       (test-set-status! db run-id test-name "COMPLETE" "FAIL" itemdat (conc "Failed at step " stepname) #f)))
 						     )
 						   (if (and (steprun-good? logpro-used (vector-ref exit-info 2))

Index: tests/tests/ezlog_fail/lookittmp.logpro
==================================================================
--- tests/tests/ezlog_fail/lookittmp.logpro
+++ tests/tests/ezlog_fail/lookittmp.logpro
@@ -5,6 +5,6 @@
 
 (expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/this hopefully will never match anything eh?/)
 
 (expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
 (expect:warning  in "LogFileBody"  = 0 "Any warning" #/WARNING/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors
+(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/.*/)) ;; force an error

Index: tests/tests/ezlog_warn/lookithome.logpro
==================================================================
--- tests/tests/ezlog_warn/lookithome.logpro
+++ tests/tests/ezlog_warn/lookithome.logpro
@@ -1,11 +1,11 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
 ;;   License GPL.
 
 
-;;(expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/)
+;; Force a warn for this test
+(expect:warning  in "LogFileBody"  = 0 "Any warning" #/.*/)
+(expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/)
 
 (expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-;; Force a warn for this test
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/.*/)
 (expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

Index: tests/tests/ezlog_warn/lookittmp.logpro
==================================================================
--- tests/tests/ezlog_warn/lookittmp.logpro
+++ tests/tests/ezlog_warn/lookittmp.logpro
@@ -1,10 +1,10 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
 ;;   License GPL.
 
 
+(expect:warning  in "LogFileBody"  = 0 "Any warning" #/.*/)
 (expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/)
 
 (expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/WARNING/)
 (expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

Index: tree.scm
==================================================================
--- tree.scm
+++ tree.scm
@@ -7,20 +7,20 @@
   (dialog
    #:title "Tree Test"
    (let ((t1 (treebox
                  #:selection_cb (lambda (obj id state)
                                     (print "selection_db with id=" id " state=" state)
-                                    (print "Userdata: " (attribute obj "USERDATA"))
-                                    (attribute-set! obj "USERDATA" "Testvalue")))))
+                                    (print "SPECIALDATA: " (attribute obj "SPECIALDATA"))
+                                    ))))
      (set! t t1)
      t1)))
 
 (show tree-dialog)
 (map (lambda (elname el)
        (print "Adding " elname " with value " el)
        (attribute-set! t elname el)
-       (attribute-set! t "USERDATA" el))
+       (attribute-set! t "SPECIALDATA" el))
      '("VALUE" "NAME"    "ADDLEAF" "ADDBRANCH1" "ADDLEAF2"    "VALUE")
      '("0"     "Figures" "Other"   "triangle"   "equilateral" "4")
      )
 (map (lambda (attr)
        (print attr " is " (attribute t attr)))

Index: utils/mt_ezstep
==================================================================
--- utils/mt_ezstep
+++ utils/mt_ezstep
@@ -12,10 +12,14 @@
 # mt_ezstep stepname command ....
 # 
 stepname=$1;shift
 command=$*
 
+allstatus=99
+runstatus=99
+logpropstatus=99
+
 # if a logpro file exists then use it otherwise just run the command, nb// was using 2>&1
 if [ -e ${stepname}.logpro ];then
    $command 2>&1| logpro ${stepname}.logpro ${stepname}.html &> ${stepname}.log 
    allstatus=(${PIPESTATUS[0]} ${PIPESTATUS[1]})
    runstatus=${allstatus[0]}
@@ -32,11 +36,14 @@
 if [ $runstatus -ne 0 ]; then
     exitstatus=$runstatus
 elif [ $logprostatus -eq 0 ]; then
     exitstatus=$logprostatus
 elif [ $logprostatus -eq 2 ]; then
-    exitstatus=0
-else 
+    exitstatus=2
+elif [ $logprostatus -eq 1 ]; then
     exitstatus=1
+else 
+    exitstatus=0
 fi
+
 $MT_MEGATEST -env2file .ezsteps/${stepname}
 exit $exitstatus