Mercurial Mercurial > oss > FCL > sftools > dev > build / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Apply trace compiler tests on to Linux fix
authoryiluzhu
Fri, 05 Mar 2010 16:25:04 +0000
branchfix
changeset 350 d8ab7aaead58
parent 302 fad68f194807
child 351 b7675b3e5a40
Apply trace compiler tests on to Linux
sbsv2/raptor/test/smoke_suite/tracecompiler_general.py file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/tracecompiler_incremental.py file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/tracecompiler_variants.py file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py file | annotate | diff | comparison | revisions 
--- a/sbsv2/raptor/test/smoke_suite/tracecompiler_general.py	Thu Mar 04 10:28:45 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_general.py	Fri Mar 05 16:25:04 2010 +0000
@@ -64,13 +64,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 +79,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 +104,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 +125,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 +146,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 +167,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 +188,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
 
--- a/sbsv2/raptor/test/smoke_suite/tracecompiler_incremental.py	Thu Mar 04 10:28:45 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_incremental.py	Fri Mar 05 16:25:04 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"
--- a/sbsv2/raptor/test/smoke_suite/tracecompiler_variants.py	Thu Mar 04 10:28:45 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_variants.py	Fri Mar 05 16:25:04 2010 +0000
@@ -70,10 +70,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 +124,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 +164,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 +214,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 +257,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
 
--- a/sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py	Thu Mar 04 10:28:45 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py	Fri Mar 05 16:25:04 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 @@
 		"<whatlog bldinf='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld2.inf' mmp='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/test.TC.mmp' config='armv5_udeb.tracecompiler'>",
 		"<build>$(EPOCROOT)/epoc32/release/armv5/lib/testTC.dso</build>",
 		"<build>$(EPOCROOT)/epoc32/release/armv5/lib/testTC{000a0000}.dso</build>",
-		"<build>$(EPOCROOT)/epoc32/release/armv5/lib/testTC{000a0000}.lib</build>",
-		"<build>$(EPOCROOT)/epoc32/release/armv5/lib/testTC.lib</build>",
 		"<build>$(EPOCROOT)/epoc32/release/armv5/udeb/testTC.dll</build>",
 		"<build>$(EPOCROOT)/epoc32/release/armv5/udeb/testTC.dll.map</build>",
 		"<build>$(EPOCROOT)/epoc32/release/armv5/urel/testTC.dll</build>",
@@ -64,7 +60,8 @@
 		"<build>$(EPOCROOT)/epoc32/ost_dictionaries/test_TC_0x1000008d_Dictionary.xml</build>",
 		"<build>$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/test_TC_0x1000008d_TraceDefinitions.h</build>"
 		]		
-	t.run("windows")
+	t.run()
+
 	t.id = "112"
 
 	return t
FCL/sftools/dev/build