# HG changeset patch # User timothy.murphy@nokia.com # Date 1268658576 0 # Node ID d18694306a106c478e61e113cb2a1ed33aed53f4 # Parent 2489b07138d35a8eb8ed22853cbda54e68938019# Parent bb0bded637e94ebdd4f9ff6f9ec82afcb0ce811e Merge diff -r bb0bded637e9 -r d18694306a10 sbsv2/raptor/RELEASE-NOTES.txt --- a/sbsv2/raptor/RELEASE-NOTES.txt Wed Mar 10 17:21:26 2010 +0000 +++ b/sbsv2/raptor/RELEASE-NOTES.txt Mon Mar 15 13:09:36 2010 +0000 @@ -3,6 +3,8 @@ next version - SF Bug 2125 - [Raptor] - tracecompiler what output incorrect if mmp basename contains '.' e.g. fred.prd.mmp - SF Bug 2191 - [Raptor] - When forcesuccess is enabled, exit status for a failed recipe is "retry" but should be "failed" +- Fix: extend tracecompiler tests to Linux +- Fix: Amendment to SF Bug 1511 fix - removal of blanked DEFFILE keyword from e32abiv2ani.flm version 2.12.4 diff -r bb0bded637e9 -r d18694306a10 sbsv2/raptor/lib/flm/e32abiv2ani.flm --- a/sbsv2/raptor/lib/flm/e32abiv2ani.flm Wed Mar 10 17:21:26 2010 +0000 +++ b/sbsv2/raptor/lib/flm/e32abiv2ani.flm Mon Mar 15 13:09:36 2010 +0000 @@ -25,7 +25,7 @@ POSTLINKFILETYPE:=ani DOPOSTLINK:=1 AUTOEXPORTS:=_Z15CreateCAnimDllLv,1; -DEFFILE:= + # Determine what kind of entrypoint option to set LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib diff -r bb0bded637e9 -r d18694306a10 sbsv2/raptor/test/smoke_suite/tracecompiler_general.py --- a/sbsv2/raptor/test/smoke_suite/tracecompiler_general.py Wed Mar 10 17:21:26 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_general.py Mon Mar 15 13:09:36 2010 +0000 @@ -18,9 +18,6 @@ from raptor_tests import AntiTargetSmokeTest def run(): - result = SmokeTest.PASS - failed = [] - t = SmokeTest() t.description = "Testcases (ID 0101a - 0101d) test trace compiler" # General test for trace compiler, which generates @@ -64,13 +61,8 @@ "testtc_dll/armv5/urel/testTC{000a0000}.def", "testtc_dll/tracecompile_testTC_1000008d.done" ]) - # 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 - failed.append(t.name) - + t.run() + # General CLEAN test for trace compiler outputs t = AntiTargetSmokeTest() t.id = "101b" @@ -84,11 +76,8 @@ t.addbuildantitargets('smoke_suite/test_resources/tracecompiler/TC_autorun/bld.inf', [ "testtc_dll/tracecompile_testTC_1000008d.done" ]) - t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - failed.append(t.name) - + t.run() + t = SmokeTest() t.id = "101c" t.name = "TC_bv_path" @@ -112,11 +101,8 @@ "helloworld_exe/armv5/urel/HelloWorld_urel_objects.via", "helloworld_exe/tracecompile_HelloWorld_e78a5aa3.done" ]) - t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - failed.append(t.name) - + t.run() + # 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 @@ -136,10 +122,7 @@ "test_/armv5/urel/test.o", "test_/tracecompile_autorun1_00000001.done" ]) - t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - failed.append(t.name) + t.run() t = AntiTargetSmokeTest() t.id = "101e" @@ -160,10 +143,7 @@ t.addbuildantitargets('smoke_suite/test_resources/tracecompiler/TC_autorun/bld.inf', [ "test_/tracecompile_autorun2_00000001.done" ]) - t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - failed.append(t.name) + t.run() t = AntiTargetSmokeTest() t.id = "101f" @@ -184,10 +164,7 @@ t.addbuildantitargets('smoke_suite/test_resources/tracecompiler/TC_autorun/bld.inf', [ "test_/tracecompile_autorun3_00000001.done" ]) - t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - failed.append(t.name) + t.run() # Test trace compiler doesn't run when it is switched off # Trace compiler switch is off by default. To turn it on use variant ".tracecompiler". @@ -208,21 +185,11 @@ t.addbuildantitargets('smoke_suite/test_resources/tracecompiler/TC_autorun/bld.inf', [ "test_/tracecompile_autorun1_00000001.done" ]) - t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - failed.append(t.name) - + t.run() + + t.id = "101" t.name = "tracecompiler_general" - t.result = result - - print "\nOverall Result : " + result.upper() + "\n" - if result == SmokeTest.FAIL: - print len(failed), "tests failed:" - for x in failed: - print x - print - + t.print_result() return t diff -r bb0bded637e9 -r d18694306a10 sbsv2/raptor/test/smoke_suite/tracecompiler_incremental.py --- a/sbsv2/raptor/test/smoke_suite/tracecompiler_incremental.py Wed Mar 10 17:21:26 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_incremental.py Mon Mar 15 13:09:36 2010 +0000 @@ -23,7 +23,7 @@ t.name = "tracecompiler_incremental_clean" t.usebash = True t.command = "sbs -b smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf -c armv5_urel.tracecompiler CLEAN" - t.run("windows") + t.run() t.id = "114b" t.name = "tracecompiler_incremental_prebuild" @@ -32,8 +32,6 @@ t.targets = [ "$(EPOCROOT)/epoc32/release/armv5/lib/testTC.dso", "$(EPOCROOT)/epoc32/release/armv5/lib/testTC{000a0000}.dso", - "$(EPOCROOT)/epoc32/release/armv5/lib/testTC{000a0000}.lib", - "$(EPOCROOT)/epoc32/release/armv5/lib/testTC.lib", "$(EPOCROOT)/epoc32/release/armv5/urel/testTC.dll", "$(EPOCROOT)/epoc32/release/armv5/urel/testTC.dll.map", "$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/traces/wlanhwinitTraces.h", @@ -43,14 +41,14 @@ "$(EPOCROOT)/epoc32/ost_dictionaries/testTC_0x1000008d_Dictionary.xml", "$(EPOCROOT)/epoc32/include/internal/symbiantraces/autogen/testTC_0x1000008d_TraceDefinitions.h" ] - t.run("windows") + t.run() t.id = "114c" t.name = "tracecompiler_incremental_rebuild" t.command = "touch smoke_suite/test_resources/tracecompiler/testTC/src/wlanhwinit.cpp && sbs -b smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf -c armv5_urel.tracecompiler -f - -m ${SBSMAKEFILE}" t.countmatch = [ ["name='compile'",1] ] t.targets = [] - t.run("windows") + t.run() t.id = "114" t.name = "tracecompiler_incremental" diff -r bb0bded637e9 -r d18694306a10 sbsv2/raptor/test/smoke_suite/tracecompiler_variants.py --- a/sbsv2/raptor/test/smoke_suite/tracecompiler_variants.py Wed Mar 10 17:21:26 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_variants.py Mon Mar 15 13:09:36 2010 +0000 @@ -1,11 +1,23 @@ +# +# Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of the License "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# from raptor_tests import SmokeTest from raptor_tests import AntiTargetSmokeTest def run(): - result = SmokeTest.PASS - failed = [] - # 102a - 102b Test running trace compiler on one mmp with different source files controlled macros. t = AntiTargetSmokeTest() t.description = "Testcases (ID 102a - 102c) test trace compiler running with variants and macros" @@ -70,10 +82,7 @@ "variant_source_/winscw/udeb/var_source3.o", "variant_source_/winscw/urel/var_source3.o" ]) - t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - failed.append(t.name) + t.run() # 2nd time build includes var_source1 and var_source3 for variant_source.mmp t = SmokeTest() @@ -127,11 +136,7 @@ "variant_source_/winscw/urel/var_source3.o.d", "variant_source_/tracecompile_variant_source_10000003.done" ]) - t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - failed.append(t.name) - + t.run() # Build multiple variants together, which involves different source files in one mmp # Raptor only call trace compiler once no matter how many variants @@ -171,11 +176,7 @@ "tc_variants_/armv5.phone3/urel/tc_c.o", "tc_variants_/tracecompile_tc_variants_10000004.done" ]) - t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - failed.append(t.name) - + t.run() # 102d and 102e is to test a very rare situation, where one mmpfile includes 3 children mmpfiles, # which are guarded by macros. They share some source file, and two share the same UID3. @@ -225,10 +226,7 @@ "child3_/tracecompile_child3_exe_11100002.done" ]) t.warnings = 3 - t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - failed.append(t.name) + t.run() # Clean mmp A then build mmp B and C. As common.cpp is shared by A B and C, commonTraces.h would be # cleaned when cleaning mmp A. But as B and C aren't cleaned, Raptor wouldn't run trace compiler on @@ -271,22 +269,12 @@ "child3_/tracecompile_child3_exe_11100002.done" ]) t.warnings = 3 - t.run("windows") - if t.result == SmokeTest.FAIL: - result = SmokeTest.FAIL - failed.append(t.name) + t.run() + t.id = "102" t.name = "tracecompiler_variants" - t.result = result - - print "\nOverall Result : " + result.upper() + "\n" - if result == SmokeTest.FAIL: - print len(failed), "tests failed:" - for x in failed: - print x - print - - t.id = "102" + t.print_result() + return t diff -r bb0bded637e9 -r d18694306a10 sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py --- a/sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py Wed Mar 10 17:21:26 2010 +0000 +++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py Mon Mar 15 13:09:36 2010 +0000 @@ -24,7 +24,7 @@ t.name = "tracecompiler_whatlog_clean" t.usebash = True t.command = "sbs -b smoke_suite/test_resources/tracecompiler/testTC/group/bld2.inf -c armv5.tracecompiler CLEAN" - t.run("windows") + t.run() t = CheckWhatSmokeTest() t.description = "Trace Compiler Whatlog test" @@ -37,8 +37,6 @@ t.targets = [ "$(EPOCROOT)/epoc32/release/armv5/lib/testTC.dso", "$(EPOCROOT)/epoc32/release/armv5/lib/testTC{000a0000}.dso", - "$(EPOCROOT)/epoc32/release/armv5/lib/testTC{000a0000}.lib", - "$(EPOCROOT)/epoc32/release/armv5/lib/testTC.lib", "$(EPOCROOT)/epoc32/release/armv5/udeb/testTC.dll", "$(EPOCROOT)/epoc32/release/armv5/udeb/testTC.dll.map", "$(EPOCROOT)/epoc32/release/armv5/urel/testTC.dll", @@ -55,8 +53,6 @@ "", "$(EPOCROOT)/epoc32/release/armv5/lib/testTC.dso", "$(EPOCROOT)/epoc32/release/armv5/lib/testTC{000a0000}.dso", - "$(EPOCROOT)/epoc32/release/armv5/lib/testTC{000a0000}.lib", - "$(EPOCROOT)/epoc32/release/armv5/lib/testTC.lib", "$(EPOCROOT)/epoc32/release/armv5/udeb/testTC.dll", "$(EPOCROOT)/epoc32/release/armv5/udeb/testTC.dll.map", "$(EPOCROOT)/epoc32/release/armv5/urel/testTC.dll", @@ -64,7 +60,8 @@ "$(EPOCROOT)/epoc32/ost_dictionaries/test_TC_0x1000008d_Dictionary.xml", "$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/test_TC_0x1000008d_TraceDefinitions.h" ] - t.run("windows") + t.run() + t.id = "112" return t