Merge windows tests fix for rpp dep files.
--- a/sbsv2/raptor/test/smoke_suite/gccxml.py Tue Apr 13 13:26:25 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/gccxml.py Tue Apr 13 13:30:12 2010 +0100
@@ -32,9 +32,9 @@
]
t.addbuildtargets('smoke_suite/test_resources/simple_gui/bld.inf', [
"helloworld_exe/gccxml/HelloWorld.mmp.xml",
- "helloworld_exe/helloworld__resource_apps_sc.rpp.d",
+ "helloworld_exe/helloworld_sc.rpp.d",
"helloworld_exe/gccxml/HelloWorld.rss.rfi",
- "helloworld_reg_exe/helloworld_reg__private_10003a3f_apps_sc.rpp.d",
+ "helloworld_reg_exe/helloworld_reg_sc.rpp.d",
"helloworld_exe/gccxml/HelloWorld_reg.rss.rfi",
"helloworld_exe/gccxml/urel/HelloWorld_Application.xml.d",
"helloworld_exe/gccxml/urel/HelloWorld_Application.xml",
@@ -66,9 +66,9 @@
t.antitargets = ["$(EPOCROOT)/epoc32/release/gccxml/urel/helloworldexe.gxp"]
t.addbuildantitargets('smoke_suite/test_resources/simple_gui/bld.inf', [
"helloworld_exe/gccxml/HelloWorld.mmp.xml",
- "helloworld_exe/helloworld__resource_apps_sc.rpp.d",
+ "helloworld_exe/helloworld_sc.rpp.d",
"helloworld_exe/gccxml/HelloWorld.rss.rfi",
- "helloworld_reg_exe/helloworld_reg__private_10003a3f_apps_sc.rpp.d",
+ "helloworld_reg_exe/helloworld_reg_sc.rpp.d",
"helloworld_exe/gccxml/HelloWorld_reg.rss.rfi",
"helloworld_exe/gccxml/urel/HelloWorld_Application.xml.d",
"helloworld_exe/gccxml/urel/HelloWorld_Application.xml",
--- a/sbsv2/raptor/test/smoke_suite/whatlog_cache.py Tue Apr 13 13:26:25 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/whatlog_cache.py Tue Apr 13 13:30:12 2010 +0100
@@ -64,8 +64,8 @@
]
t.addbuildtargets('smoke_suite/test_resources/simple_gui/Bld.inf', [
"helloworld_exe/helloworld.mbm_bmconvcommands",
- "helloworld_exe/helloworld__resource_apps_sc.rpp",
- "helloworld_exe/helloworld__resource_apps_sc.rpp.d",
+ "helloworld_exe/helloworld_sc.rpp",
+ "helloworld_exe/helloworld_sc.rpp.d",
"helloworld_exe/armv5/udeb/HelloWorld_Application.o",
"helloworld_exe/armv5/udeb/HelloWorld_Application.o.d",
"helloworld_exe/armv5/udeb/HelloWorld_AppUi.o",
@@ -126,7 +126,7 @@
"helloworld_exe/winscw/urel/helloworld_UID_.dep",
"helloworld_exe/winscw/urel/helloworld_UID_.o",
"helloworld_exe/winscw/urel/helloworld_UID_.o.d",
- "helloworld_reg_exe/helloworld_reg__private_10003a3f_apps_sc.rpp.d"
+ "helloworld_reg_exe/helloworld_reg_sc.rpp.d"
])
t.countmatch = [
["\$self->{abldcache}->{.*\\\\test\\\\smoke_suite\\\\test_resources\\\\simple_gui target (armv5|winscw) (udeb|urel) -what\'} =", 4],