diff -r fdf44dc5eff3 -r 6fdebb56755a sbsv2/raptor/test/smoke_suite/timeout.py
--- a/sbsv2/raptor/test/smoke_suite/timeout.py	Fri Mar 26 15:47:26 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/timeout.py	Mon Mar 29 11:35:45 2010 +0100
@@ -26,9 +26,9 @@
 	t.id = "60a"
 	t.name = "timeout"
 	t.usebash = True
-	t.command = "sbs -b smoke_suite/test_resources/timeout/bld.inf -f-"
+	t.command = "sbs -b smoke_suite/test_resources/timeout/bld.inf -f -"
 
-	t.mustmatch = [
+	t.mustmatch_singleline = [
 		"status exit='failed' code='" + exitCode + "' attempt='1' reason='timeout'",
 	]
 	t.errors = -1
@@ -38,7 +38,7 @@
 	t.id = "60b"
 	t.name = "timeout with retries"
 	t.usebash = True
-	t.command = "sbs -b smoke_suite/test_resources/timeout/bld.inf -t 3 -f-"
+	t.command = "sbs -b smoke_suite/test_resources/timeout/bld.inf -t 3 -f -"
 
 	t.mustmatch_singleline = [
 		"status exit='retry' code='" + exitCode + "' attempt='1' reason='timeout'",