--- a/sbsv2/raptor/test/run.bat	Thu Feb 18 15:38:39 2010 +0000
+++ b/sbsv2/raptor/test/run.bat	Thu Feb 18 15:44:01 2010 +0000
@@ -1,5 +1,5 @@
 @rem
-@rem Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+@rem Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 @rem All rights reserved.
 @rem This component and the accompanying materials are made available
 @rem under the terms of the License "Eclipse Public License v1.0"
@@ -16,27 +16,16 @@
 
 @echo off
 
-set HOSTPLATFORM=win 32
-set HOSTPLATFORM_DIR=win32
-
-setlocal
-set __PYTHON__=%SBS_PYTHON%
-if "%__PYTHON__%"=="" set __PYTHON__=%SBS_HOME%\win32\python264\python.exe
+@SETLOCAL
+@CALL %SBS_HOME%\bin\sbs_env.bat
 
-set __TEST_SUITE__=%SBS_HOME%\test\common\run_tests.pyc
-set __TEST_SUITE_PY__=%SBS_HOME%\test\common\run_tests.py
-
-@REM Mount '/' in cygwin, in case it is not done automatically
-set __CYGWIN__=%SBS_CYGWIN%
-if "%__CYGWIN__%"=="" set __CYGWIN__=%SBS_HOME%\win32\cygwin
-%__CYGWIN__%\bin\umount -u "/" >NUL  2>NUL
-%__CYGWIN__%\bin\mount -u "%__CYGWIN__%" "/"
+@SET __TEST_SUITE__=%SBS_HOME%\test\common\run_tests.pyc
+@SET __TEST_SUITE_PY__=%SBS_HOME%\test\common\run_tests.py
 
 @REM If the Python source exists, use it. Else use the byte-compiled Python code
-if exist %__TEST_SUITE_PY__% SET __TEST_SUITE__=%__TEST_SUITE_PY__%
+@IF EXIST %__TEST_SUITE_PY__% SET __TEST_SUITE__=%__TEST_SUITE_PY__%
 
 @REM Then run the test suite with all the arguments
-%__PYTHON__% -tt %__TEST_SUITE__% %*
+@%__PYTHON__% -tt %__TEST_SUITE__% %*
 
-endlocal
-@echo on
+@ENDLOCAL