--- a/sbsv2/raptor/test/smoke_suite/tracecompiler_general.py	Tue Jan 12 10:50:54 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_general.py	Tue Jan 19 18:53:34 2010 +0000
@@ -1,12 +1,27 @@
+#
+# 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 CheckWhatSmokeTest
+from raptor_tests import SmokeTest
 from raptor_tests import AntiTargetSmokeTest
 
 def run():
-	result = CheckWhatSmokeTest.PASS
+	result = SmokeTest.PASS
 	failed = []
 
-	t = CheckWhatSmokeTest()
+	t = SmokeTest()
 	t.description = "Testcases (ID 0101a - 0101d) test trace compiler"
 	# General test for trace compiler, which generates
 	# 1. trace headers like <source>Traces.h
@@ -49,15 +64,11 @@
 		"testtc_dll/armv5/urel/testTC{000a0000}.def",
 		"testtc_dll/tracecompile_testTC_1000008d.done"
 	])
-	t.stdout = [
-		"<build>$(EPOCROOT)/epoc32/OST_Dictionaries/testTC_0x1000008d_Dictionary.xml</build>",
-		"<build>$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/testTC_0x1000008d_TraceDefinitions.h</build>"
-		]		
 	# 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 == CheckWhatSmokeTest.FAIL:
-		result = CheckWhatSmokeTest.FAIL
+	if t.result == SmokeTest.FAIL:
+		result = SmokeTest.FAIL
 		failed.append(t.name)
 
 	# General CLEAN test for trace compiler outputs
@@ -74,11 +85,11 @@
 		"testtc_dll/tracecompile_testTC_1000008d.done"
 	])
 	t.run("windows")
-	if t.result == CheckWhatSmokeTest.FAIL:
-		result = CheckWhatSmokeTest.FAIL
+	if t.result == SmokeTest.FAIL:
+		result = SmokeTest.FAIL
 		failed.append(t.name)
 		
-	t = CheckWhatSmokeTest()
+	t = SmokeTest()
 	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" 
@@ -101,20 +112,16 @@
 		"helloworld_exe/armv5/urel/HelloWorld_urel_objects.via",
 		"helloworld_exe/tracecompile_HelloWorld_e78a5aa3.done"
 	])
-	t.stdout = [
-		"<build>$(EPOCROOT)/epoc32/OST_Dictionaries/HelloWorld_0xe78a5aa3_Dictionary.xml</build>",
-		"<build>$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/HelloWorld_0xe78a5aa3_TraceDefinitions.h</build>"
-		]		
 	t.run("windows")
-	if t.result == CheckWhatSmokeTest.FAIL:
-		result = CheckWhatSmokeTest.FAIL
+	if t.result == SmokeTest.FAIL:
+		result = SmokeTest.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_<prj_name>" folder in USERINCLUDE in a mmp file. 
-	t = CheckWhatSmokeTest()
+	t = SmokeTest()
 	t.id = "101d"
 	t.name = "TC_autorun1"
 	# Run - USERINCLUDE ../traces_autorun1
@@ -130,8 +137,8 @@
 		"test_/tracecompile_autorun1_00000001.done"
 	])
 	t.run("windows")
-	if t.result == CheckWhatSmokeTest.FAIL:
-		result = CheckWhatSmokeTest.FAIL
+	if t.result == SmokeTest.FAIL:
+		result = SmokeTest.FAIL
 		failed.append(t.name)
 	
 	t = AntiTargetSmokeTest()
@@ -154,8 +161,8 @@
 		"test_/tracecompile_autorun2_00000001.done"
 	])
 	t.run("windows")
-	if t.result == CheckWhatSmokeTest.FAIL:
-		result = CheckWhatSmokeTest.FAIL
+	if t.result == SmokeTest.FAIL:
+		result = SmokeTest.FAIL
 		failed.append(t.name)
 
 	t = AntiTargetSmokeTest()
@@ -178,8 +185,8 @@
 		"test_/tracecompile_autorun3_00000001.done"
 	])
 	t.run("windows")
-	if t.result == CheckWhatSmokeTest.FAIL:
-		result = CheckWhatSmokeTest.FAIL
+	if t.result == SmokeTest.FAIL:
+		result = SmokeTest.FAIL
 		failed.append(t.name)
 
 	# Test trace compiler doesn't run when it is switched off
@@ -202,16 +209,16 @@
 		"test_/tracecompile_autorun1_00000001.done"
 	])
 	t.run("windows")
-	if t.result == CheckWhatSmokeTest.FAIL:
-		result = CheckWhatSmokeTest.FAIL
+	if t.result == SmokeTest.FAIL:
+		result = SmokeTest.FAIL
 		failed.append(t.name)
 	
 
-	t.name = "traceccompiler_general"
+	t.name = "tracecompiler_general"
 	t.result = result
 
 	print "\nOverall Result : " + result.upper() + "\n"
-	if result == CheckWhatSmokeTest.FAIL:
+	if result == SmokeTest.FAIL:
 		print len(failed), "tests failed:"
 		for x in failed:
 			print x