1
=== modified file 'run-tests.bat'
2
--- run-tests.bat	2012-07-13 18:55:53 +0000
3
+++ run-tests.bat	2012-07-30 18:24:18 +0000
4
@@ -12,35 +12,29 @@
5
12
:: You should have received a copy of the GNU General Public License along
12
:: You should have received a copy of the GNU General Public License along
6
13
:: with this program.  If not, see <http://www.gnu.org/licenses/>.
13
:: with this program.  If not, see <http://www.gnu.org/licenses/>.
7
14
@ECHO off
14
@ECHO off
26
15
:: We could have Python 2.6 or 2.7 on Windows. In order to check availability,
15
27
16
:: we should first check for 2.7, and run the tests, otherwise fall back to 2.6.
16
SET PYTHONEXEPATH=""
28
17
SET PYTHONEXECPATH=""
17
SET PYTHONPATH=.
29
18
:: This is very annoying; FOR /F will work differently depending on the output
18
30
19
:: of reg which is not consistent between OS versions (XP, 7). We must choose
19
ECHO Checking for Python on the path
31
20
:: the tokens according to OS version.
20
:: Look for Python from buildout
32
21
SET PYTHONPATHTOKENS=3
21
FOR %%A in (python.exe) do (SET PYTHONEXEPATH=%%~$PATH:A)
33
22
VER | FIND "XP" > nul
22
FOR %%C in (pyflakes) do (SET FLAKESPATH=%%~$PATH:C)
34
23
IF %ERRORLEVEL% == 0 SET PYTHONPATHTOKENS=4
23
FOR %%D in (pep8.exe) do (SET PEP8PATH=%%~$PATH:D)
35
24
ECHO Checking if python 2.7 is in the system
24
36
25
:: Look for python 2.7
25
IF NOT "%PYTHONEXEPATH%" == "" GOTO :PYTHONPRESENT
37
26
FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('REG QUERY HKLM\Software\Python\PythonCore\2.7\InstallPath /ve') DO @SET PYTHONEXECPATH=%%A
26
20
27
IF NOT %PYTHONEXECPATH% == "" GOTO :PYTHONPRESENT
21
28
ECHO Checking if python 2.6 is in the system
22
29
:: we do not have python 2.7 in the system, try to find 2.6
23
30
FOR /F "tokens=%PYTHONPATHTOKENS%" %%A IN ('REG QUERY HKLM\Software\Python\PythonCore\2.6\InstallPath /ve') DO @SET PYTHONEXECPATH=%%A
24
31
IF NOT %PYTHONEXECPATH% == "" GOTO :PYTHONPRESENT
25
32
:: we do not have python (2.6 or 2.7), therefore we go to end
38
33
ECHO Please ensure you have python installed
27
ECHO Please ensure you have python installed
39
34
GOTO :END
28
GOTO :END
40
35
29
41
36
:PYTHONPRESENT
30
:PYTHONPRESENT
42
37
ECHO Python found, executing the tests...
31
ECHO Python found, executing the tests...
43
38
:: execute the tests with a number of ignored linux only modules
32
:: execute the tests with a number of ignored linux only modules
46
39
"%PYTHONEXECPATH%\python.exe" setup.py build test clean
33
"%PYTHONEXEPATH%" setup.py build test clean
47
40
"%PYTHONEXECPATH%\python.exe" "%PYTHONEXECPATH%\Scripts\pyflakes" dirspec
34
"%PYTHONEXEPATH%" "%FLAKESPATH%" dirspec
48
41
:: test for style if we can, if pep8 is not present, move to the end
35
:: test for style if we can, if pep8 is not present, move to the end
53
42
IF EXIST "%PYTHONEXECPATH%Scripts\pep8.exe"
36
IF EXIST "%PEP8PATH%" (
54
43
"%PYTHONEXECPATH%\Scripts\pep8.exe" --repeat dirspec
37
"%PEP8PATH%" --repeat dirspec
55
44
ELSE
38
)ELSE (
56
45
ECHO Style checks were not done
39
ECHO Style checks were not done)
57
46
:END
40
:END
Status:	Merged
Approved by:	dobey on 2012-07-30
Approved revision:	no longer in the source branch.
Merged at revision:	9
Proposed branch:	lp:~dobey/dirspec/update-4-0
Merge into:	lp:dirspec/stable-4-0
Diff against target:	57 lines (+18/-24) 1 file modified run-tests.bat (+18/-24)
To merge this branch:	bzr merge lp:~dobey/dirspec/update-4-0
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Roberto Alsina (community)		2012-07-30	Approve on 2012-07-30
Review via email: mp+117317@code.launchpad.net