Merge lp:~brian.curtin/ubuntuone-control-panel/run-tests-update into lp:ubuntuone-control-panel

[Brian Curtin]

- Update run-tests.bat to work with buildout changes to executable paths.

Update Windwos run-tests script to work with recent buildout changes

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-08-06 17:23:10 +0000
+++ run-tests.bat	2012-10-08 20:41:20 +0000
@@ -25,8 +25,8 @@
 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 %%B in (u1trial.exe) do (SET TRIALPATH=%%~$PATH:B)
+FOR %%C in (u1lint.exe) do (SET LINTPATH=%%~$PATH:C)
 FOR %%D in (pep8.exe) do (SET PEP8PATH=%%~$PATH:D)
 
 IF NOT "%PYTHONEXEPATH%" == "" GOTO :PYTHONPRESENT
@@ -64,14 +64,14 @@
 "%PYTHONEXEPATH%" setup.py build
 ECHO Running tests
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%" "%TRIALPATH%" --reactor=qt4 --gui -p %IGNORE_PATHS% -i %IGNORE_MODULES% %PARAMS% %MODULE%
+"%TRIALPATH%" --reactor=qt4 --gui -p %IGNORE_PATHS% -i %IGNORE_MODULES% %PARAMS% %MODULE%
 :: Clean the build from the setupt.py
 ECHO Cleaning the generated code
 "%PYTHONEXEPATH%" setup.py clean
 
 IF %SKIPLINT% == 1 GOTO :CLEAN
 ECHO Performing style checks...
-"%PYTHONEXEPATH%" "%LINTPATH%" --ignore ubuntuone\controlpanel\gui\qt\ui "%MODULE%"
+"%LINTPATH%" --ignore ubuntuone\controlpanel\gui\qt\ui "%MODULE%"
 "%PEP8PATH%" --exclude ".svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py" --repeat . bin\*
 :CLEAN
 :: Delete the temp folders