Merge lp:~mandel/ubuntuone-dev-tools/fix-runtests into lp:ubuntuone-dev-tools

[Manuel de la Peña]

- Changed the way in which python is found and ensured that we use PYTHONEXEPATH to not override the PYTHONPATH value (LP: #986125).

- Changed the way in which python is found and ensured that we use PYTHONEXEPATH to not override the PYTHONPATH value (LP: #986125).

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-04-18 20:08:00 +0000
+++ run-tests.bat	2012-04-20 10:52:20 +0000
@@ -27,36 +27,66 @@
 :: version.  If you delete this exception statement from all source
 :: files in the program, then also delete it here.
 @ECHO off
+
 :: We could have Python 2.6 or 2.7 on Windows. In order to check availability,
 :: we should first check for 2.7, and run the tests, otherwise fall back to 2.6.
-SET PYTHONPATH=""
+SET REGQUERY27="REG QUERY HKLM\Software\Python\PythonCore\2.7\InstallPath /ve"
+SET REGQUERY2732="REG QUERY HKLM\Software\Wow6432Node\Python\PythonCore\2.7\InstallPath /ve"
+SET REGQUERY26="REG QUERY HKLM\Software\Python\PythonCore\2.6\InstallPath /ve"
+SET REGQUERY2632="REG QUERY HKLM\Software\Wow6432Node\Python\PythonCore\2.6\InstallPath /ve"
+SET PYTHONEXEPATH=""
+
 :: This is very annoying; FOR /F will work differently depending on the output
 :: of reg which is not consistent between OS versions (XP, 7). We must choose
 :: the tokens according to OS version.
+::
 SET PYTHONPATHTOKENS=3
 VER | FIND "XP" > nul
-IF %ERRORLEVEL% == 0 SET PYTHONPATHTOKENS=4
+IF %ERRORLEVEL% == 0 (
+    SET PYTHONPATHTOKENS=4)
+
 ECHO Checking if python 2.7 is in the system
+
 :: Look for python 2.7
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('REG QUERY HKLM\Software\Python\PythonCore\2.7\InstallPath /ve') DO @SET PYTHONPATH=%%A
-IF NOT %PYTHONPATH% == "" GOTO :PYTHONPRESENT
+FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY27%') DO @SET PYTHONEXEPATH=%%A
+
+IF NOT %PYTHONEXEPATH% == "" (
+    GOTO :PYTHONPRESENT)
+
 ECHO Checking if python 2.6 is in the system
 :: we do not have python 2.7 in the system, try to find 2.6
-FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('REG QUERY HKLM\Software\Python\PythonCore\2.6\InstallPath /ve') DO @SET PYTHONPATH=%%A
-IF NOT %PYTHONPATH% == "" GOTO :PYTHONPRESENT
-:: we do not have python (2.6 or 2.7), therefore we go to end
+FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY26%') DO @SET PYTHONEXEPATH=%%A
+
+IF NOT %PYTHONEXEPATH% == "" (
+    GOTO :PYTHONPRESENT)
+
+:: we do not have python (2.6 or 2.7) this could hapen in the case  that the
+:: user installed the 32version in a 64 machine, let check if the software was installed in the wow key
+
+:: Look for python 2.7 in WoW64
+ECHO Checking if python 2.7 32 is in the system
+FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY2732%') DO @SET PYTHONEXEPATH=%%A
+
+IF NOT %PYTHONEXEPATH% == "" (
+    GOTO :PYTHONPRESENT)
+
+ECHO Checking if python 2.6 32 is in the system
+:: we do not have python 2.7 in the system, try to find 2.6
+FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('%REGQUERY2632%') DO @SET PYTHONEXEPATH=%%A
+IF NOT %PYTHONEXEPATH% == "" (
+    GOTO :PYTHONPRESENT)
+
 ECHO Please ensure you have python installed
 GOTO :END
 
-
 :PYTHONPRESENT
 ECHO Python found, executing the tests...
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONPATH%\python.exe" bin/u1trial --reactor=twisted -c ubuntuone
-"%PYTHONPATH%\python.exe" bin/u1lint
+"%PYTHONEXEPATH%\python.exe" bin/u1trial --reactor=twisted -c ubuntuone
+"%PYTHONEXEPATH%\python.exe" bin/u1lint
 :: test for style if we can, if pep8 is not present, move to the end
-IF EXIST "%PYTHONPATH%Scripts\pep8.exe"
-START "Pep8" /B "%PYTHONPATH%\Scripts\pep8.exe" --repeat
+IF EXIST "%PYTHONEXEPATH%Scripts\pep8.exe"
+START "Pep8" /B "%PYTHONEXEPATH%\Scripts\pep8.exe" --repeat
 ELSE
 ECHO Style checks were not done
 :: Delete the temp folders