--- a/sbsv2/raptor/test/smoke_suite/exe_armv5_winscw_single_file.py Wed Jul 28 13:20:46 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/exe_armv5_winscw_single_file.py Thu Aug 12 09:00:16 2010 +0100
@@ -27,8 +27,8 @@
t.command = "sbs -b smoke_suite/test_resources/simple_gui/Bld.inf -c armv5 -c winscw"
t.addbuildtargets('smoke_suite/test_resources/simple_gui/Bld.inf', [
"helloworld_exe/helloworld.mbm_bmconvcommands",
- "helloworld_exe/helloworld_HelloWorld_sc.rpp",
- "helloworld_exe/helloworld_HelloWorld_sc.rpp.d",
+ "helloworld_exe/helloworld_HelloWorld.rsc.rpp",
+ "helloworld_exe/helloworld_HelloWorld.rsc.d",
"helloworld_exe/armv5/udeb/HelloWorld_Application.o",
"helloworld_exe/armv5/udeb/HelloWorld_Application.o.d",
"helloworld_exe/armv5/udeb/HelloWorld_AppUi.o",
@@ -91,8 +91,8 @@
"helloworld_exe/winscw/urel/helloworld_UID_.o",
"helloworld_exe/winscw/urel/helloworld_UID_.o.d",
"helloworld_exe/winscw/urel/helloworld_urel_objects.lrf",
- "helloworld_reg_exe/helloworld_reg_HelloWorld_reg_sc.rpp",
- "helloworld_reg_exe/helloworld_reg_HelloWorld_reg_sc.rpp.d"
+ "helloworld_reg_exe/helloworld_reg_HelloWorld_reg.rsc.rpp",
+ "helloworld_reg_exe/helloworld_reg_HelloWorld_reg.rsc.d"
])
t.run()
@@ -113,7 +113,7 @@
touch smoke_suite/test_resources/simple_gui/HelloWorld.rss
sbs -f - --source-target=smoke_suite/test_resources/simple_gui/HelloWorld_Document.cpp --source-target=smoke_suite/test_resources/simple_gui/HelloWorld.rss -b smoke_suite/test_resources/simple_gui/Bld.inf"""
t.countmatch = [
- [".*recipe name='resource(preprocess|header|compile)'", 3],
+ [".*recipe name='resource(dependencies|compile)'", 2],
[".*recipe name='compile'.*", 2],
[".*recipe name='win32compile2object'.*", 2]
]
@@ -134,7 +134,7 @@
[".*make.*Nothing to be done for.*SOURCETARGET_.*", 10]
]
t.mustnotmatch = [
- ".*recipe name='(resourcepreprocess|win32compile2object|compile|win32simplelink|postlink|link)'.*"
+ ".*recipe name='(resourcecompile|win32compile2object|compile|win32simplelink|postlink|link)'.*"
]
t.run()