--- a/sbsv2/raptor/test/unit_suite/generic_path_unit.py	Tue Mar 23 17:11:09 2010 +0000
+++ b/sbsv2/raptor/test/unit_suite/generic_path_unit.py	Thu Mar 25 15:34:29 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"

--- a/sbsv2/raptor/test/unit_suite/raptor_data_unit.py	Tue Mar 23 17:11:09 2010 +0000
+++ b/sbsv2/raptor/test/unit_suite/raptor_data_unit.py	Thu Mar 25 15:34:29 2010 +0000
@@ -36,8 +36,8 @@
 			self.envStack[name] = os.environ[name]
 		os.environ[name] = value
 		
-	def isWin32(self):
-		return sys.platform.lower().startswith("win")		
+	def isWin(self):
+		return 'win' in raptor.hostplatform
 			
 	def RestoreEnv(self, name):
 		# put environment back to its state before SetEnv
@@ -410,7 +410,7 @@
 		except Exception, e:
 			exceptionText = str(e)
 			
-		if self.isWin32():
+		if self.isWin():
 			self.assertTrue(value)
 			self.assertFalse(' ' in value)
 		else:
@@ -424,7 +424,7 @@
 		except Exception, e:
 			exceptionText = str(e)
 			
-		if self.isWin32():
+		if self.isWin():
 			self.assertTrue(value)
 			self.assertFalse(' ' in value)
 		else: