# HG changeset patch
# User Richard Taylor <richard.i.taylor@nokia.com>
# Date 1264515928 0
# Node ID eff54c65de8b27cc71b85142b6616ddee05a4bd2
# Parent  cbe4932f8f5ffc787d19c934a9bfbb4991915e29# Parent  6080bce951bf5881fd245f61fd2b5d5ade5a862b
catch up

diff -r cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/RELEASE-NOTES.txt
--- a/sbsv2/raptor/RELEASE-NOTES.txt	Tue Jan 26 14:20:20 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt	Tue Jan 26 14:25:28 2010 +0000
@@ -1,6 +1,12 @@
 
 Release Notes for Symbian Build System v2
 
+Next version
+
+Defect fixes:
+- SF Bug 1494 - sbs --what does not report Trace Compiler output
+- sbs -c winscw.tracecompiler uses wrong UID and doesn't generate traces
+
 version 2.12.0
 
 New Features:
diff -r cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/lib/flm/e32abiv2.flm
--- a/sbsv2/raptor/lib/flm/e32abiv2.flm	Tue Jan 26 14:20:20 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm	Tue Jan 26 14:25:28 2010 +0000
@@ -697,6 +697,7 @@
 # Users can turn TC on by setting it to 1 in user config.
 ifneq ($(USE_TRACE_COMPILER),)
   include $(FLMHOME)/tracecompiler.mk
+  WHATRELEASE:=$(WHATRELEASE) $(TRACE_DICTIONARY) $(AUTOGEN_HEADER)
 endif
 
 CC_CPPONLY_ARGS:=$(SYMBIAN_CCFLAGS) $(if $(DEBUG_INFO),-g) $(DEBUG_FORMAT) \
diff -r cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/lib/flm/tracecompiler.mk
--- a/sbsv2/raptor/lib/flm/tracecompiler.mk	Tue Jan 26 14:20:20 2010 +0000
+++ b/sbsv2/raptor/lib/flm/tracecompiler.mk	Tue Jan 26 14:25:28 2010 +0000
@@ -25,6 +25,9 @@
 TRACE_PRJNAME:=$(TARGET)_$(TARGETTYPE)
 endif
 
+TRACE_DICTIONARY:=$(EPOCROOT)/epoc32/ost_dictionaries/$(TRACE_PRJNAME)_0x$(UID_TC)_Dictionary.xml
+AUTOGEN_HEADER:=$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/$(TRACE_PRJNAME)_0x$(UID_TC)_TraceDefinitions.h
+
 $(if $(FLMDEBUG),$(info <debug>TRACE_PATH = $(TRACE_PATH)</debug>))
 
 # Run trace compiler only if TRACE_PATH exists
diff -r cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/lib/flm/win32.flm
--- a/sbsv2/raptor/lib/flm/win32.flm	Tue Jan 26 14:20:20 2010 +0000
+++ b/sbsv2/raptor/lib/flm/win32.flm	Tue Jan 26 14:25:28 2010 +0000
@@ -50,6 +50,7 @@
 MAINLINKAS:=
 NEWLIBFILE:=
 RELEASABLES:=
+TC_RELEASABLES:=
 STATLIBDIR:=
 STDCPP_BUILD:=
 STDCPPTAGFILE:=
@@ -204,7 +205,7 @@
 # Run trace compiler #####################################
 TRACE_MARKER_PATH:=$(OUTPUTPATH)
 
-ifeq ($(UID3),)
+ifeq ($(subst 0,,$(UID3)),)
   ifeq ($(UID2),)
     USE_TRACE_COMPILER:=
   else
@@ -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_RELEASABLES:=$(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 cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/test/common/raptor_tests.py
--- a/sbsv2/raptor/test/common/raptor_tests.py	Tue Jan 26 14:20:20 2010 +0000
+++ b/sbsv2/raptor/test/common/raptor_tests.py	Tue Jan 26 14:25:28 2010 +0000
@@ -165,8 +165,9 @@
 						except:							
 							print "\nEPOCROOT-CLEAN ERROR:"
 							print (sys.exc_type.__name__ + ":"), \
-									sys.exc_value, "\n", \
-									traceback.print_tb(sys.exc_traceback)
+									sys.exc_value
+							if sys.exc_type.__name__ != "WindowsError":
+								print traceback.print_tb(sys.exc_traceback)
 									
 			# This loop handles folders
 			for name in dirs:
@@ -181,8 +182,9 @@
 					except:
 						print "\nEPOCROOT-CLEAN ERROR:"
 						print (sys.exc_type.__name__ + ":"), \
-								sys.exc_value, "\n", \
-								traceback.print_tb(sys.exc_traceback)
+								sys.exc_value
+						if sys.exc_type.__name__ != "WindowsError":
+							print traceback.print_tb(sys.exc_traceback)
 	except IOError,e:
 		print e
 	
diff -r cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/test/smoke_suite/apply_usecases.py
--- a/sbsv2/raptor/test/smoke_suite/apply_usecases.py	Tue Jan 26 14:20:20 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/apply_usecases.py	Tue Jan 26 14:25:28 2010 +0000
@@ -22,7 +22,7 @@
 	t.usebash = True
 
 	# Introduce LINKER_OPTIONS for tools2 linker
-	t.id = "xx"
+	t.id = "0108"
 	t.name = "apply_linker_options"
 	t.command = "sbs -b smoke_suite/test_resources/apply_usecases/linker_options/bld.inf -c tools2 -f -"
 	t.targets = [
diff -r cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/test/smoke_suite/commandline.py
--- a/sbsv2/raptor/test/smoke_suite/commandline.py	Tue Jan 26 14:20:20 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/commandline.py	Tue Jan 26 14:25:28 2010 +0000
@@ -1,10 +1,24 @@
+#
+# 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: 
 # General commandline option handling tests which aren't appropriate as unit tests.
 
 from raptor_tests import SmokeTest
 
 def run():
 	t = SmokeTest()
-	t.id = "91a"
+	t.id = "85a"
 	t.name = "commandline_nodefaults"
 	t.description = """Test that raptor complains if you run it without specifying any components and there is no default bld.inf or system definition in the current directory."""
 	t.usebash = True
@@ -13,9 +27,12 @@
 		TMPDIR="build/commandline_testdefaults";
 		cd $(EPOCROOT)/epoc32 && rm -rf "$TMPDIR" 2>/dev/null; mkdir -p "$TMPDIR" && cd "$TMPDIR" &&
 		sbs ${SBSLOGFILE} -n ; rm -rf "$TMPDIR"
-m	""" 
+	""" 
 		
 	t.mustmatch = [".*warning: No default bld.inf or system definition.*found.* "]
 	t.warnings = 1
-	t.result = t.run()
+	t.run()
+
+	t.id = "0085"
+	t.name = "commandline"
 	return t
diff -r cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/test/smoke_suite/pdll_arm.py
--- a/sbsv2/raptor/test/smoke_suite/pdll_arm.py	Tue Jan 26 14:20:20 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/pdll_arm.py	Tue Jan 26 14:25:28 2010 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# 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"
@@ -50,7 +50,7 @@
 	# Note that ABIv1 import libraries are only generated for RVCT-based armv5
 	# builds on Windows
 	
-	t.id = "0104a"
+	t.id = "0109a"
 	t.name = "pdll_armv5_rvct"
 	t.command = command % "armv5"
 	t.targets = map(lambda p: p % "armv5", maintargets + armv5targets)[:]	# Shallow, as we optionally extend later and then re-use
@@ -62,7 +62,7 @@
 		t.targets.extend(map(lambda x: x % "armv5", abiv1libtargets))
 		t.run("windows")
 		
-	t.id = "0104b"
+	t.id = "0109b"
 	t.name = "pdll_armv5_clean"
 	t.command = command % "armv5" + " clean"
 	t.targets = []
@@ -70,7 +70,7 @@
 	t.mustnotmatch = []
 	t.run()
 	
-	t.id = "0104c"
+	t.id = "0109c"
 	t.name = "pdll_armv5_gcce"
 	t.command = command % "gcce_armv5"
 	t.targets = map(lambda p: p % "armv5", maintargets + armv5targets)
@@ -80,7 +80,7 @@
 	t.mustnotmatch = mustnotmatch
 	t.run()
 
-	t.id = "0104d"
+	t.id = "0109d"
 	t.name = "pdll_armv5_gcce_clean"
 	t.command = command % "gcce_armv5" + " clean"
 	t.targets = []
@@ -88,7 +88,7 @@
 	t.mustnotmatch = []
 	t.run()
 
-	t.id = "0104e"
+	t.id = "0109e"
 	t.name = "pdll_armv7_rvct"
 	t.command = command % "armv7"
 	t.targets = map(lambda p: p % "armv7", maintargets)[:]	# Shallow, as we optionally extend later and then re-use
@@ -97,7 +97,7 @@
 	t.mustnotmatch = mustnotmatch
 	t.run()
 	
-	t.id = "0104f"
+	t.id = "0109f"
 	t.name = "pdll_armv7_clean"
 	t.command = command % "armv7" + " clean"
 	t.targets = []
@@ -105,7 +105,7 @@
 	t.mustnotmatch = []
 	t.run()
 	
-	t.id = "0104g"
+	t.id = "0109g"
 	t.name = "pdll_armv7_gcce"
 	t.command = command % "arm.v7.udeb.gcce4_3_2 -c arm.v7.urel.gcce4_3_2"
 	t.targets = map(lambda p: p % "armv7", maintargets)
@@ -115,7 +115,7 @@
 	t.mustnotmatch = mustnotmatch
 	t.run()
 
-	t.id = "104"
+	t.id = "109"
 	t.name = "pdll_arm"
 	t.print_result()
 	return t
diff -r cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/test/smoke_suite/qt.py
--- a/sbsv2/raptor/test/smoke_suite/qt.py	Tue Jan 26 14:20:20 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2009 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: 
-# This test case requires install of Qt. 
-
-from raptor_tests import SmokeTest
-
-def run():
-	t = SmokeTest()
-
-	t.description = "Ensure Raptor builds Qt applications successfully"	
-
-	t.id = "00xx"	# TO DO: update ID
-	t.name = "qt_helloworld"
-	t.command = "cd smoke_suite/test_resources/qt && qmake -spec symbian-sbsv2 && sbs"
-	t.targets = [
-			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/bld.inf",
-			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt.loc",
-			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt.rss",
-			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt_reg.rss",
-			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt_template.pkg",
-			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/Makefile",
-			"$(EPOCROOT)/epoc32/release/armv5/udeb/helloworldqt.exe",
-			"$(EPOCROOT)/epoc32/release/armv5/udeb/helloworldqt.exe.map",
-			"$(EPOCROOT)/epoc32/release/armv5/urel/helloworldqt.exe",
-			"$(EPOCROOT)/epoc32/release/armv5/urel/helloworldqt.exe.map",
-			"$(EPOCROOT)/epoc32/release/winscw/udeb/helloworldqt.exe",
-			"$(EPOCROOT)/epoc32/release/winscw/urel/helloworldqt.exe",
-			"$(EPOCROOT)/epoc32/release/winscw/urel/helloworldqt.exe.map"
-		]
-	t.addbuildtargets('smoke_suite/test_resources/qt/bld.inf', [
-		"helloworldqt_exe/armv5/udeb/helloworld.o",
-		"helloworldqt_exe/armv5/udeb/helloworld.o.d",
-		"helloworldqt_exe/armv5/urel/helloworld.o",
-		"helloworldqt_exe/armv5/urel/helloworld.o.d",
-		"helloworldqt_exe/winscw/udeb/helloworld.o",
-		"helloworldqt_exe/winscw/udeb/helloworld.o.d",	
-		"helloworldqt_exe/winscw/urel/helloworld.o",
-		"helloworldqt_exe/winscw/urel/helloworld.o.d"
-	])
-	t.run("windows")
-
-	return t
-
diff -r cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/test/smoke_suite/qt_helloworld.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/qt_helloworld.py	Tue Jan 26 14:25:28 2010 +0000
@@ -0,0 +1,55 @@
+#
+# 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: 
+# This test case requires install of Qt. 
+
+from raptor_tests import SmokeTest
+
+def run():
+	t = SmokeTest()
+
+	t.description = "Ensure Raptor builds Qt applications successfully"	
+
+	t.id = "0110"
+	t.name = "qt_helloworld"
+	t.command = "cd smoke_suite/test_resources/qt && qmake -spec symbian-sbsv2 && sbs"
+	t.targets = [
+			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/bld.inf",
+			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt.loc",
+			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt.rss",
+			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt_reg.rss",
+			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt_template.pkg",
+			"$(SBS_HOME)/test/smoke_suite/test_resources/qt/Makefile",
+			"$(EPOCROOT)/epoc32/release/armv5/udeb/helloworldqt.exe",
+			"$(EPOCROOT)/epoc32/release/armv5/udeb/helloworldqt.exe.map",
+			"$(EPOCROOT)/epoc32/release/armv5/urel/helloworldqt.exe",
+			"$(EPOCROOT)/epoc32/release/armv5/urel/helloworldqt.exe.map",
+			"$(EPOCROOT)/epoc32/release/winscw/udeb/helloworldqt.exe",
+			"$(EPOCROOT)/epoc32/release/winscw/urel/helloworldqt.exe",
+			"$(EPOCROOT)/epoc32/release/winscw/urel/helloworldqt.exe.map"
+		]
+	t.addbuildtargets('smoke_suite/test_resources/qt/bld.inf', [
+		"helloworldqt_exe/armv5/udeb/helloworld.o",
+		"helloworldqt_exe/armv5/udeb/helloworld.o.d",
+		"helloworldqt_exe/armv5/urel/helloworld.o",
+		"helloworldqt_exe/armv5/urel/helloworld.o.d",
+		"helloworldqt_exe/winscw/udeb/helloworld.o",
+		"helloworldqt_exe/winscw/udeb/helloworld.o.d",	
+		"helloworldqt_exe/winscw/urel/helloworld.o",
+		"helloworldqt_exe/winscw/urel/helloworld.o.d"
+	])
+	t.run("windows")
+
+	return t
+
diff -r cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/test/smoke_suite/toolchain_macros.py
--- a/sbsv2/raptor/test/smoke_suite/toolchain_macros.py	Tue Jan 26 14:20:20 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/toolchain_macros.py	Tue Jan 26 14:25:28 2010 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# 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"
@@ -37,14 +37,14 @@
 	
 	count = 0	
 	for toolchain in sorted(toolchains.keys()):
-		t.id = "0103" + string.ascii_lowercase[count]
+		t.id = "0095" + string.ascii_lowercase[count]
 		t.name = rootname % (toolchain, "clean")
 		t.command = rootcommand + toolchain + " clean"
 		t.mustmatch_singleline = []
 		t.run()
 		count += 1
 		
-		t.id = "0103" + string.ascii_lowercase[count]
+		t.id = "0095" + string.ascii_lowercase[count]
 		t.name = rootname % (toolchain, "build")
 		t.command = rootcommand + toolchain
 		mustmatch = []	
@@ -54,7 +54,7 @@
 		t.run()
 		count += 1
 
-	t.id = "103"
+	t.id = "95"
 	t.name = "toolchain_macros"
 	t.print_result()
 	return t
diff -r cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/test/smoke_suite/tracecompiler_general.py
--- a/sbsv2/raptor/test/smoke_suite/tracecompiler_general.py	Tue Jan 26 14:20:20 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_general.py	Tue Jan 26 14:25:28 2010 +0000
@@ -1,3 +1,18 @@
+#
+# 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
@@ -199,7 +214,7 @@
 		failed.append(t.name)
 	
 
-	t.name = "traceccompiler_general"
+	t.name = "tracecompiler_general"
 	t.result = result
 
 	print "\nOverall Result : " + result.upper() + "\n"
diff -r cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py	Tue Jan 26 14:25:28 2010 +0000
@@ -0,0 +1,62 @@
+#
+# Copyright (c) 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,AntiTargetSmokeTest
+import re
+
+def run():
+	t = CheckWhatSmokeTest()
+	t.description = "Trace Compiler Whatlog test"
+	t.id = "xxx"
+	t.name = "tracecompiler_whatlog"
+	t.usebash = True
+	t.command = "sbs -b smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf -c armv5.tracecompiler -m ${SBSMAKEFILE} -f ${SBSLOGFILE} && cat ${SBSLOGFILE}"
+	t.hostossensitive = False
+	t.regexlinefilter = re.compile("^<(whatlog|export|build>|resource>|bitmap>)")
+	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",
+		"$(EPOCROOT)/epoc32/release/armv5/urel/testTC.dll.map",
+		"$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/traces/wlanhwinitTraces.h",
+		"$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/traces/wlanhwinitmainTraces.h",
+		"$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/traces/wlanhwinitpermparserTraces.h",	
+		"$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/traces/fixed_id.definitions",
+		"$(EPOCROOT)/epoc32/ost_dictionaries/testTC_0x1000008d_Dictionary.xml",
+		"$(EPOCROOT)/epoc32/include/internal/symbiantraces/autogen/testTC_0x1000008d_TraceDefinitions.h"
+		]
+	t.stdout = [
+		"<whatlog bldinf='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf' mmp='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/testTC.mmp' config='armv5_urel.tracecompiler'>",
+		"<whatlog bldinf='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/bld.inf' mmp='$(SBS_HOME)/test/smoke_suite/test_resources/tracecompiler/testTC/group/testTC.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>",
+		"<build>$(EPOCROOT)/epoc32/release/armv5/urel/testTC.dll.map</build>",
+		"<build>$(EPOCROOT)/epoc32/ost_dictionaries/testTC_0x1000008d_Dictionary.xml</build>",
+		"<build>$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/testTC_0x1000008d_TraceDefinitions.h</build>"
+		]		
+	t.run("windows")
+
+	return t
+
diff -r cbe4932f8f5f -r eff54c65de8b sbsv2/raptor/test/smoke_suite/whatcomp.py
--- a/sbsv2/raptor/test/smoke_suite/whatcomp.py	Tue Jan 26 14:20:20 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/whatcomp.py	Tue Jan 26 14:25:28 2010 +0000
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# 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"
@@ -58,7 +58,7 @@
 	warnings = 0
 	
 	t.id = "0106"
-	t.name = "filter_whatcomp_sbs_filter"
+	t.name = "whatcomp"
 	t.description = description
 	t.command = command % "arm.v5.urel.gcce4_4_1"
 	t.targets = targets