diff -r 3a62f88a49f8 -r 245c03ee6e9c sbsv2/raptor/test/smoke_suite/timing.py --- a/sbsv2/raptor/test/smoke_suite/timing.py Mon May 17 18:27:21 2010 +0100 +++ b/sbsv2/raptor/test/smoke_suite/timing.py Mon May 17 18:33:53 2010 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. # This component and the accompanying materials are made available # under the terms of the License "Eclipse Public License v1.0" @@ -22,21 +22,10 @@ t.description = "Test that a timing log is created and contains total parse and build durations" - t.id = "0103a" - t.name = "timing_off" - t.command = "sbs -b smoke_suite/test_resources/simple/bld.inf -f-" - t.mustnotmatch = [ - ".*progress:discovery.*", - ".*progress:start.*", - ".*progress:end.*" - ] - t.run() - - t.id = "0103b" t.name = "timing_on" - t.command = "sbs -b smoke_suite/test_resources/simple/bld.inf --timing " + \ - "--filters=FilterLogfile,FilterTiming -f ${SBSLOGFILE} && " + \ + t.command = "sbs -b smoke_suite/test_resources/simple/bld.inf" + \ + " --filters=FilterLogfile,FilterTiming -f ${SBSLOGFILE} && " + \ "grep progress:duration ${SBSLOGFILE}.timings" t.mustmatch = [ "^$",