diff -r 9758784ab2d3 -r d1af983e283d sbsv2/raptor/test/smoke_suite/commandline.py --- a/sbsv2/raptor/test/smoke_suite/commandline.py Mon Jan 25 11:43:34 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/commandline.py Mon Jan 25 17:17:52 2010 +0000 @@ -4,7 +4,7 @@ def run(): t = SmokeTest() - t.id = "91a" + t.id = "85a" t.name = "commandline_nodefaults" t.description = """Test that raptor complains if you run it without specifying any components and there is no default bld.inf or system definition in the current directory.""" t.usebash = True @@ -13,9 +13,12 @@ TMPDIR="build/commandline_testdefaults"; cd $(EPOCROOT)/epoc32 && rm -rf "$TMPDIR" 2>/dev/null; mkdir -p "$TMPDIR" && cd "$TMPDIR" && sbs ${SBSLOGFILE} -n ; rm -rf "$TMPDIR" -m """ + """ t.mustmatch = [".*warning: No default bld.inf or system definition.*found.* "] t.warnings = 1 - t.result = t.run() + t.run() + + t.id = "0085" + t.name = "commandline" return t