# HG changeset patch # User timothy.murphy@nokia.com # Date 1270735271 -3600 # Node ID d1500715c07343096ac22113d2ca9e882c15a0f1 # Parent 8786668610aecdde3dbf696c802158596106af82 fix: resource speedup's whatlog handling. update other tests to cope with alternate rpp.d files. diff -r 8786668610ae -r d1500715c073 sbsv2/raptor/lib/flm/resource.flm --- a/sbsv2/raptor/lib/flm/resource.flm Thu Apr 08 13:44:00 2010 +0100 +++ b/sbsv2/raptor/lib/flm/resource.flm Thu Apr 08 15:01:11 2010 +0100 @@ -225,7 +225,6 @@ # $(2) is the preprocessed resource to make it from # $(3) is the language e.g. sc or 01 or 02 - RELEASABLES:=$$(RELEASABLES) $(1) ifeq ($(TARGET_$(call sanitise,$1)),) TARGET_$(call sanitise,$1):=1 diff -r 8786668610ae -r d1500715c073 sbsv2/raptor/test/smoke_suite/exe_armv5_winscw_single_file.py --- a/sbsv2/raptor/test/smoke_suite/exe_armv5_winscw_single_file.py Thu Apr 08 13:44:00 2010 +0100 +++ b/sbsv2/raptor/test/smoke_suite/exe_armv5_winscw_single_file.py Thu Apr 08 15:01:11 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__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", @@ -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__private_10003a3f_apps_sc.rpp", - "helloworld_reg_exe/helloworld_reg__private_10003a3f_apps_sc.rpp.d" + "helloworld_reg_exe/helloworld_reg_sc.rpp", + "helloworld_reg_exe/helloworld_reg_sc.rpp.d" ]) t.run() diff -r 8786668610ae -r d1500715c073 sbsv2/raptor/test/smoke_suite/featurevariants.py --- a/sbsv2/raptor/test/smoke_suite/featurevariants.py Thu Apr 08 13:44:00 2010 +0100 +++ b/sbsv2/raptor/test/smoke_suite/featurevariants.py Thu Apr 08 15:01:11 2010 +0100 @@ -168,8 +168,8 @@ "createstaticdll_invariant_dll/armv5/urel/createstaticdll_invariant{000a0000}.def", "createstaticdll_invariant_dll/armv5/urel/createstaticdll_invariant{000a0000}.dso", - "dummy_inv_dll/dummy_inv__resource_apps_sc.rpp", - "dummy_inv_dll/dummy_inv__resource_apps_sc.rpp.d" + "dummy_inv_dll/dummy_inv_sc.rpp", + "dummy_inv_dll/dummy_inv_sc.rpp.d" ] variantBuildTargetsDefaultTree = [ @@ -293,12 +293,12 @@ ] variantBuildTargetsGeneric = [ - "dummy_var1_dll/dummy_var1__resource_apps_sc.rpp", - "dummy_var1_dll/dummy_var1__resource_apps_sc.rpp.d", - "dummy_var2_dll/dummy_var2__resource_apps_sc.rpp", - "dummy_var2_dll/dummy_var2__resource_apps_sc.rpp.d", - "dummy_var3_exe/dummy_var3__resource_apps_sc.rpp", - "dummy_var3_exe/dummy_var3__resource_apps_sc.rpp.d" + "dummy_var1_dll/dummy_var1_sc.rpp", + "dummy_var1_dll/dummy_var1_sc.rpp.d", + "dummy_var2_dll/dummy_var2_sc.rpp", + "dummy_var2_dll/dummy_var2_sc.rpp.d", + "dummy_var3_exe/dummy_var3_sc.rpp", + "dummy_var3_exe/dummy_var3_sc.rpp.d" ] sbscommand = "sbs -b smoke_suite/test_resources/bv/bld.inf -c armv5 " + \ diff -r 8786668610ae -r d1500715c073 sbsv2/raptor/test/smoke_suite/gui_whatlog.py --- a/sbsv2/raptor/test/smoke_suite/gui_whatlog.py Thu Apr 08 13:44:00 2010 +0100 +++ b/sbsv2/raptor/test/smoke_suite/gui_whatlog.py Thu Apr 08 15:01:11 2010 +0100 @@ -49,8 +49,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", @@ -111,7 +111,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.stdout = [ "", diff -r 8786668610ae -r d1500715c073 sbsv2/raptor/test/smoke_suite/sysdef_layers.py --- a/sbsv2/raptor/test/smoke_suite/sysdef_layers.py Thu Apr 08 13:44:00 2010 +0100 +++ b/sbsv2/raptor/test/smoke_suite/sysdef_layers.py Thu Apr 08 15:01:11 2010 +0100 @@ -52,7 +52,7 @@ "$(EPOCROOT)/epoc32/localisation/helloworld_reg/rsc/helloworld_reg.rpp" ] t.addbuildtargets('smoke_suite/test_resources/sysdef/build_gen_source/bld.inf', [ - "helloworld_/helloworld__resource_apps_sc.rpp" + "helloworld_/helloworld_sc.rpp" ]) t.addbuildtargets('smoke_suite/test_resources/sysdef/dependent/bld.inf', [ "helloworld_exe/armv5/udeb/HelloWorld_Application.o", @@ -79,11 +79,11 @@ "helloworld_exe/winscw/urel/HelloWorld_Main.o", "helloworld_exe/winscw/urel/helloworld.UID.CPP", "helloworld_exe/winscw/urel/helloworld_UID_.o", - "helloworld_reg_exe/helloworld_reg__private_10003a3f_apps_sc.rpp" + "helloworld_reg_exe/helloworld_reg_sc.rpp" ]) t.countmatch = [ - ["", 37], - ["", 7] + ["", 38], + ["", 8] ] t.run() return t