# HG changeset patch # User Iain Williamson # Date 1263293259 0 # Node ID 62c28226cde43cef184d52cd0af66a6eb4398354 # Parent ae46aeb3faf3389534d2072fdd9b3ce5beb93aea Bug 1494 - Trace compiler files not in whatlog - FIX and TESTS though UNTESTED since only run on Linux so far diff -r ae46aeb3faf3 -r 62c28226cde4 sbsv2/raptor/lib/flm/e32abiv2.flm --- a/sbsv2/raptor/lib/flm/e32abiv2.flm Wed Dec 23 15:10:51 2009 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2.flm Tue Jan 12 10:47:39 2010 +0000 @@ -640,6 +640,7 @@ # Users can turn TC on by setting it to 1 in user config. ifneq ($(USE_TRACE_COMPILER),) include $(FLMHOME)/tracecompiler.mk + WHATRELEASE:=$(WHAT_RELEASE) $(TRACE_DICTIONARY) $(AUTOGEN_HEADER) endif CC_CPPONLY_ARGS:=$(SYMBIAN_CCFLAGS) $(if $(DEBUG_INFO),-g) $(DEBUG_FORMAT) \ diff -r ae46aeb3faf3 -r 62c28226cde4 sbsv2/raptor/lib/flm/tracecompiler.mk --- a/sbsv2/raptor/lib/flm/tracecompiler.mk Wed Dec 23 15:10:51 2009 +0000 +++ b/sbsv2/raptor/lib/flm/tracecompiler.mk Tue Jan 12 10:47:39 2010 +0000 @@ -25,6 +25,9 @@ TRACE_PRJNAME:=$(TARGET)_$(TARGETTYPE) endif +TRACE_DICTIONARY:=epoc32\\OST_Dictionaries\\$(TRACE_PRJNAME)_$(TC_UID)_Dictionary.xml +AUTOGEN_HEADER:=epoc32\\include\\internal\\SymbianTraces\\autogen\\$(TRACE_PRJNAME)_$(TC_UID)_Traces.h + $(if $(FLMDEBUG),$(info TRACE_PATH = $(TRACE_PATH))) # Run trace compiler only if TRACE_PATH exists diff -r ae46aeb3faf3 -r 62c28226cde4 sbsv2/raptor/lib/flm/win32.flm --- a/sbsv2/raptor/lib/flm/win32.flm Wed Dec 23 15:10:51 2009 +0000 +++ b/sbsv2/raptor/lib/flm/win32.flm Tue Jan 12 10:47:39 2010 +0000 @@ -50,6 +50,7 @@ MAINLINKAS:= NEWLIBFILE:= RELEASABLES:= +TC_RELEASABLES:= STATLIBDIR:= STDCPP_BUILD:= STDCPPTAGFILE:= @@ -218,6 +219,7 @@ # Users can turn TC on by setting it to 1 in user config. ifneq ($(USE_TRACE_COMPILER),) include $(FLMHOME)/tracecompiler.mk + TC_RELEASABLE:=$(TRACE_DICTIONARY) $(AUTOGEN_HEADER) endif @@ -688,4 +690,4 @@ # make the output directories while reading makefile - some build engines prefer this $(call makepath,$(CREATABLEPATHS)) # for the --what option and the log file -$(call raptor_release,$(RELEASABLES)) +$(call raptor_release,$(RELEASABLES) $(TC_RELEASABLES)) diff -r ae46aeb3faf3 -r 62c28226cde4 sbsv2/raptor/test/smoke_suite/tracecompiler_general.py --- a/sbsv2/raptor/test/smoke_suite/tracecompiler_general.py Wed Dec 23 15:10:51 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_general.py Tue Jan 12 10:47:39 2010 +0000 @@ -1,12 +1,12 @@ -from raptor_tests import SmokeTest +from raptor_tests import CheckWhatSmokeTest from raptor_tests import AntiTargetSmokeTest def run(): - result = SmokeTest.PASS + result = CheckWhatSmokeTest.PASS failed = [] - t = SmokeTest() + t = CheckWhatSmokeTest() t.description = "Testcases (ID 0101a - 0101d) test trace compiler" # General test for trace compiler, which generates # 1. trace headers like Traces.h @@ -49,11 +49,15 @@ "testtc_dll/armv5/urel/testTC{000a0000}.def", "testtc_dll/tracecompile_testTC_1000008d.done" ]) + t.stdout = [ + "$(EPOCROOT)/epoc32/OST_Dictionaries/testTC_0x1000008d_Dictionary.xml", + "$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/testTC_0x1000008d_TraceDefinitions.h" + ] # Trace compiler doesn't work on Linux for time being. Once it's fixed, will apply all # trace compiler tests to linux as well. t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL + if t.result == CheckWhatSmokeTest.FAIL: + result = CheckWhatSmokeTest.FAIL failed.append(t.name) # General CLEAN test for trace compiler outputs @@ -70,11 +74,11 @@ "testtc_dll/tracecompile_testTC_1000008d.done" ]) t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL + if t.result == CheckWhatSmokeTest.FAIL: + result = CheckWhatSmokeTest.FAIL failed.append(t.name) - t = SmokeTest() + t = CheckWhatSmokeTest() t.id = "101c" t.name = "TC_bv_path" t.command = "sbs -b smoke_suite/test_resources/tracecompiler/TC_featurevariant/group/bld.inf -c armv5.tracecompiler" @@ -97,16 +101,20 @@ "helloworld_exe/armv5/urel/HelloWorld_urel_objects.via", "helloworld_exe/tracecompile_HelloWorld_e78a5aa3.done" ]) + t.stdout = [ + "$(EPOCROOT)/epoc32/OST_Dictionaries/HelloWorld_0xe78a5aa3_Dictionary.xml", + "$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/HelloWorld_0xe78a5aa3_TraceDefinitions.h" + ] t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL + if t.result == CheckWhatSmokeTest.FAIL: + result = CheckWhatSmokeTest.FAIL failed.append(t.name) # 101d-101f test trace compiler auto mechanism, which is used to avoid wasting time on source # containing no osttraces. # Trace compiler only runs when there are osttraces code in source. Raptor decides this by # checking whether there is a "traces" or "traces_" folder in USERINCLUDE in a mmp file. - t = SmokeTest() + t = CheckWhatSmokeTest() t.id = "101d" t.name = "TC_autorun1" # Run - USERINCLUDE ../traces_autorun1 @@ -122,8 +130,8 @@ "test_/tracecompile_autorun1_00000001.done" ]) t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL + if t.result == CheckWhatSmokeTest.FAIL: + result = CheckWhatSmokeTest.FAIL failed.append(t.name) t = AntiTargetSmokeTest() @@ -146,8 +154,8 @@ "test_/tracecompile_autorun2_00000001.done" ]) t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL + if t.result == CheckWhatSmokeTest.FAIL: + result = CheckWhatSmokeTest.FAIL failed.append(t.name) t = AntiTargetSmokeTest() @@ -170,8 +178,8 @@ "test_/tracecompile_autorun3_00000001.done" ]) t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL + if t.result == CheckWhatSmokeTest.FAIL: + result = CheckWhatSmokeTest.FAIL failed.append(t.name) # Test trace compiler doesn't run when it is switched off @@ -194,8 +202,8 @@ "test_/tracecompile_autorun1_00000001.done" ]) t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL + if t.result == CheckWhatSmokeTest.FAIL: + result = CheckWhatSmokeTest.FAIL failed.append(t.name) @@ -203,7 +211,7 @@ t.result = result print "\nOverall Result : " + result.upper() + "\n" - if result == SmokeTest.FAIL: + if result == CheckWhatSmokeTest.FAIL: print len(failed), "tests failed:" for x in failed: print x