--- a/sbsv2/raptor/RELEASE-NOTES.txt	Mon Jan 25 09:50:36 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt	Mon Jan 25 09:56:17 2010 +0000
@@ -49,6 +49,7 @@
   The output is in CSV format.  
 
 Defect Fixes:
+- fix for ARM9E + ARMV5 pre-processing confusion
 - SF bug 1570: Adding then removing a capability can produce incorrect 
   result: e.g. ALL TCB -TCB becomes ALL -TCB but it should be just ALL
 

--- a/sbsv2/raptor/bin/sbs.bat	Mon Jan 25 09:50:36 2010 +0000
+++ b/sbsv2/raptor/bin/sbs.bat	Mon Jan 25 09:56:17 2010 +0000
@@ -23,9 +23,9 @@
 @IF NOT "%SBS_HOME%"==""  goto foundhome
 @SET RAPTORBINDIR=%~dp0
 @SET WD=%cd%
-@cd %RAPTORBINDIR%\..
+@cd /d %RAPTORBINDIR%\..
 @SET SBS_HOME=%cd%
-@cd %WD%
+@cd /d %WD%
 :foundhome 
 
 @REM Use the python set by the environment if possible

--- a/sbsv2/raptor/test/smoke_suite/exe_checksource.py	Mon Jan 25 09:50:36 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/exe_checksource.py	Mon Jan 25 09:56:17 2010 +0000
@@ -33,9 +33,8 @@
 	cmd3 = "grep -i '.*checksource errors found.*' ${SBSLOGFILE}"
 	t.command = cmd1 + " && " + cmd2 + " && " + cmd3
 
-	t.mustmatch = [
-		".* 5 checksource errors found.*"
-		]
+	t.mustmatch_singleline = ["[1-9] checksource errors found"]
+	
 	t.returncode = 1
 	t.run("windows")
 	return t

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/variantplatforms/bld.inf	Mon Jan 25 09:56:17 2010 +0000
@@ -0,0 +1,43 @@
+/*
+* 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: 
+*
+*/
+
+PRJ_PLATFORMS
+armv5 armv6 armv7
+
+PRJ_EXPORTS
+variantplatforms.flm /epoc32/tools/makefile_templates/tools/variantplatforms.flm
+variantplatforms.xml /epoc32/tools/makefile_templates/tools/variantplatforms.xml
+
+/* 
+   set the FLM parameter based on the pre-processing macros, so that we can
+   test that this bld.inf is actually processed for each of the platforms
+   that we expect - including ones that are extensions of ARMV5 (eg. ARM9E)
+*/ 
+#if defined(ARM9E)
+#define PARAMETER arm9e
+#elif defined(ARMV7)
+#define PARAMETER armv7
+#elif defined(ARMV6)
+#define PARAMETER armv6
+#else
+#define PARAMETER armv5
+#endif
+
+PRJ_EXTENSIONS
+start extension tools/variantplatforms
+option VP PARAMETER
+end

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/variantplatforms/variantplatforms.flm	Mon Jan 25 09:56:17 2010 +0000
@@ -0,0 +1,2 @@
+
+$(call raptor_phony_recipe,name,ALL,,echo "building variant platform $(VP)")

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/variantplatforms/variantplatforms.xml	Mon Jan 25 09:56:17 2010 +0000
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?> 
+<build xmlns="http://symbian.com/xml/build" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symbian.com/xml/build build/2_0.xsd"> 
+
+ <interface name="tools.variantplatforms" flm="variantplatforms.flm">
+  <param name="VP" /> 
+ </interface>
+
+</build>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/variantplatforms.py	Mon Jan 25 09:56:17 2010 +0000
@@ -0,0 +1,38 @@
+#
+# 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 SmokeTest
+
+def run():
+	t = SmokeTest()
+	t.id = "300"
+	t.name = "variantplatforms"
+	t.description = "Can all the variant platforms be built at the same time."
+	
+	variantplatforms = ["armv5", "armv6", "armv7", "arm9e"]
+	
+	t.usebash = True
+	t.command = "sbs -b smoke_suite/test_resources/variantplatforms/bld.inf -f-"
+	t.mustmatch_singleline = []
+	
+	for vp in variantplatforms:
+		t.command += " -c " + vp
+		t.mustmatch_singleline.append("building variant platform " + vp)
+
+	t.run()
+	
+	t.print_result()
+	return t