Merge lp:~brian.curtin/ubuntuone-dev-tools/runtests-update-for-buildout into lp:ubuntuone-dev-tools

[Brian Curtin]

- Update the run-tests.bat script to work with a buildout-based setup.

Update the run-tests.bat script to work with a buildout-based setup.

[Roberto Alsina (ralsina)]

+1

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-04-20 11:37:33 +0000
+++ run-tests.bat	2012-04-25 12:40:24 +0000
@@ -28,59 +28,18 @@
 :: 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 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)
-
-ECHO Checking if python 2.7 is in the system
-
-:: Look for python 2.7
-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 ('%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 Checking for Python on the path
+:: Look for Python from buildout
+FOR %%A in (python.exe) do (SET PYTHONEXEPATH=%%~$PATH:A)
+FOR %%B in (u1trial) do (SET TRIALPATH=%%~$PATH:B)
+FOR %%C in (u1lint) do (SET LINTPATH=%%~$PATH:C)
+FOR %%D in (pep8.exe) do (SET PEP8PATH=%%~$PATH:D)
+
+IF NOT "%PYTHONEXEPATH%" == "" GOTO :PYTHONPRESENT
 ECHO Please ensure you have python installed
 GOTO :END
 
 :PYTHONPRESENT
-
 :: throw the first parameter away if is /skip-lint,
 :: the way we do this is to ensure that /skip-lint
 :: is the first parameter and copy all the rest in a loop
@@ -106,22 +65,27 @@
 GOTO GETREST
 :CONTINUEBATCH
 
-ECHO Python found, executing the tests...
+ECHO Python found at %PYTHONEXEPATH%, executing the tests...
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%\python.exe" bin/u1trial --reactor=twisted -c %PARAMS% ubuntuone
+"%PYTHONEXEPATH%" "%TRIALPATH%" --reactor=twisted -c %PARAMS% ubuntuone
 
 IF %SKIPLINT% == 1 (
     ECHO Skipping style checks
     GOTO :CLEAN)
 
-"%PYTHONEXEPATH%\python.exe" bin/u1lint
+"%PYTHONEXEPATH%" "%LINTPATH%" 
 :: test for style if we can, if pep8 is not present, move to the end
-IF EXIST "%PYTHONEXEPATH%Scripts\pep8.exe"
-START "Pep8" /B "%PYTHONEXEPATH%\Scripts\pep8.exe" --repeat
-ELSE
+IF NOT EXIST "%PEP8PATH%" GOTO :NOPEP8
+START "Pep8" /B "%PEP8PATH%" --repeat
+:NOPEP8
 ECHO Style checks were not done
 :CLEAN
+
+IF EXIST \.coverage RMDIR /s /q \.coverage
 :: Delete the temp folders
-RMDIR /s /q _trial_temp
-RMDIR /s /q .coverage
+IF "%TRIAL_TEMP_DIR%" == "" GOTO :TRIALTEMPEXISTS
+IF EXIST _trial_temp RMDIR /s /q _trial_temp
+:TRIALTEMPEXISTS
+IF EXIST "%TRIAL_TEMP_DIR%" RMDIR /s /q "%TRIAL_TEMP_DIR%"
+
 :END