--- a/sbsv2/raptor/lib/config/msvc.xml	Fri Mar 12 12:17:30 2010 +0000
+++ b/sbsv2/raptor/lib/config/msvc.xml	Wed Mar 17 15:19:15 2010 +0000
@@ -32,7 +32,6 @@
 		<set name='OPT.NOLOGO' value='-nologo'/>
 		<set name='OPT.OBJECTFILE' value='-Fo'/>
 		<set name='OPT.OUTFILE' value='-out:'/>
-		<set name='OPT.PDBFILE' value='-Fd'/>
 		<set name='OPT.PREINCLUDE' value='-FI '/>
 		<set name='OPT.SUBSYSTEM' value='-subsystem:'/>
 		<set name='OPT.SYSINCLUDE' value='-I '/>
@@ -44,7 +43,7 @@
 		<set name='CDEFS.REL' value='NDEBUG'/>
 		<set name='CFLAGS' value='$(OPT.COMPILE) $(OPT.NOLOGO) -Zp4 -GF'/>
 		<set name='CFLAGS.DEFAULT.WARNLEVEL' value='-W4'/>
-		<set name='CFLAGS.DEB' value='-Zi -Od'/>
+		<set name='CFLAGS.DEB' value='-Od'/>
 		<set name='CFLAGS.REL' value='-O1 -Op'/>
 		<set name='SHAREDFLAGS' value='kernel32.lib $(OPT.NOLOGO) -machine:IX86  -ignore:4089 -ignore:4005 -ignore:4098'/>
 		<set name='LD' value='$(MS_LINK)'/>

--- a/sbsv2/raptor/lib/flm/msvctools.flm	Fri Mar 12 12:17:30 2010 +0000
+++ b/sbsv2/raptor/lib/flm/msvctools.flm	Wed Mar 17 15:19:15 2010 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2008-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"
@@ -59,8 +59,7 @@
 DEFINES:=$(call makemacrodef,$(OPT.DEFINE),$(CDEFS) $(BASE_MACRO) $(CFLAGS.ADD))
 
 # other
-PDBFILE:=$(if $(GENDEBUGINFO),$(RELEASEPATH)/$(TARGET).pdb,)
-CLEANTARGETS:=$(CLEANTARGETS) $(PDBFILE)
+CLEANTARGETS:=$(CLEANTARGETS)
 
 #compile
 define msvctoolscompile
@@ -70,7 +69,6 @@
 	$(if $(findstring staticlib,$(BASE_TYPE)),,$(CFLAGS.LIB)) \
 	$(CFLAGS) $$(subst /,-,$(OPTION_MSVC)) \
 	$(if $(findstring /W,$(OPTION_MSVC)),,$(CFLAGS.DEFAULT.WARNLEVEL)) \
-	$(if $(PDBFILE),$$(call msvcformatarg,$(OPT.PDBFILE),$(PDBFILE)),) \
 	$(DEFINES) $(INCLUDES) \
 	$$(call msvcformatarg,$(OPT.BROWSEFILE),$(BUILDPATH)/$(basename $(notdir $(1))).sbr) \
 	$$(call msvcformatarg,$(OPT.OBJECTFILE),$$@) $(1) \

--- a/sbsv2/raptor/lib/flm/msvctools.xml	Fri Mar 12 12:17:30 2010 +0000
+++ b/sbsv2/raptor/lib/flm/msvctools.xml	Wed Mar 17 15:19:15 2010 +0000
@@ -42,7 +42,6 @@
 		<param name='OPT.LISTING'/>
 		<param name='OPT.OBJECTFILE'/>
 		<param name='OPT.OUTFILE'/>
-		<param name='OPT.PDBFILE'/>
 		<param name='OPT.PREINCLUDE'/>
 		<param name='OPT.SUBSYSTEM'/>
 		<param name='OPT.SYSINCLUDE'/>

--- a/sbsv2/raptor/test/smoke_suite/tools.py	Fri Mar 12 12:17:30 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/tools.py	Wed Mar 17 15:19:15 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"
@@ -20,19 +20,15 @@
 	t = SmokeTest()
 	t.id = "52"
 	t.name = "tools"
-	# Do not run with j > 1 because of known issues
-	t.command = "sbs -b smoke_suite/test_resources/tools/bld.inf -c tools -j1"
+	t.command = "sbs -b smoke_suite/test_resources/tools/bld.inf -c tools"
 	t.targets = [
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_exe.bsc",
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_exe.exe",
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_exe.ilk",
-		"$(EPOCROOT)/epoc32/release/tools/deb/tool_exe.pdb",
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_lib1.bsc",
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_lib1.lib",
-		"$(EPOCROOT)/epoc32/release/tools/deb/tool_lib1.pdb",
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_lib2.bsc",
 		"$(EPOCROOT)/epoc32/release/tools/deb/tool_lib2.lib",
-		"$(EPOCROOT)/epoc32/release/tools/deb/tool_lib2.pdb",
 		"$(EPOCROOT)/epoc32/release/tools/rel/tool_exe.exe",
 		"$(EPOCROOT)/epoc32/release/tools/rel/tool_lib1.lib",
 		"$(EPOCROOT)/epoc32/release/tools/rel/tool_lib2.lib",