Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -6,11 +6,11 @@
 ;;  This program is distributed WITHOUT ANY WARRANTY; without even the
 ;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 ;;  PURPOSE.
 
 (include "common.scm")
-(define megatest-version 1.06)
+(define megatest-version 1.07)
 
 (define help (conc "
 Megatest, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
   license GPL, Copyright Matt Welland 2006-2011
@@ -479,14 +479,14 @@
 	  (if (args:get-arg "-setlog")
 	      (test-set-log! db run-id test-name itemdat (args:get-arg "-setlog")))
 	  (if (args:get-arg "-set-toplog")
 	      (test-set-toplog! db run-id test-name (args:get-arg "-set-toplog")))
 	  (if (args:get-arg "-test-status")
-	      (let ((newstat (cond
-			      ((number? status)       (if (equal? status 0) "PASS" "FAIL"))
-			      ((string->number status)(if (equal? (string->number status) 0) "PASS" "FAIL"))
-			      (else status))))
+	      (let ((newstatus (cond
+				((number? status)       (if (equal? status 0) "PASS" "FAIL"))
+				((string->number status)(if (equal? (string->number status) 0) "PASS" "FAIL"))
+				(else status))))
 		(test-set-status! db run-id test-name state newstatus itemdat (args:get-arg "-m")))
 	      (if (and state status)
 		  (if (not (args:get-arg "-setlog"))
 		      (begin
 			(print "ERROR: You must specify :state and :status with every call to -test-status\n" help)

Index: tests/tests/runfirst/main.sh
==================================================================
--- tests/tests/runfirst/main.sh
+++ tests/tests/runfirst/main.sh
@@ -4,6 +4,6 @@
 # sleep 20
 # megatest -step wasting_time :state end :status $?
 
 $MT_MEGATEST -runstep wasting_time -logpro wasting_time.logpro "sleep 20;echo all done eh?" -m "This is a test step comment"
 
-$MT_MEGATEST -test-status :state COMPLETED :status PASS -m "This is a test level comment" -set-toplog the_top_log.html
+$MT_MEGATEST -test-status :state COMPLETED :status $? -m "This is a test level comment" -set-toplog the_top_log.html