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

[Manuel de la Peña]

- Pass the parameters provided to the runtests.bat to u1trial and allow to skip the lint checks (LP: #986144).

- Pass the parameters provided to the runtests.bat to u1trial and allow to skip the lint checks (LP: #986144).

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-04-20 10:48:38 +0000
+++ run-tests.bat	2012-04-20 11:43:25 +0000
@@ -80,15 +80,47 @@
 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
+:: the main reason for that is that %* is not affected
+:: by SHIFT, that is, it allways have all passed parameters
+
+SET PARAMS=%*
+SET SKIPLINT=0
+IF "%1" == "/skip-lint" (
+    SET SKIPLINT=1
+    GOTO :CLEANPARAMS
+)ELSE (
+    GOTO :CONTINUEBATCH)
+
+:CLEANPARAMS
+SHIFT
+SET PARAMS=%1
+:GETREST
+SHIFT
+if [%1]==[] (
+    GOTO CONTINUEBATCH)
+SET PARAMS=%PARAMS% %1
+GOTO GETREST
+:CONTINUEBATCH
+
 ECHO Python found, executing the tests...
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%\python.exe" bin/u1trial --reactor=twisted -c ubuntuone
+"%PYTHONEXEPATH%\python.exe" bin/u1trial --reactor=twisted -c %PARAMS% ubuntuone
+
+IF %SKIPLINT% == 1 (
+    ECHO Skipping style checks
+    GOTO :CLEAN)
+
 "%PYTHONEXEPATH%\python.exe" bin/u1lint
 :: 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
 ECHO Style checks were not done
+:CLEAN
 :: Delete the temp folders
 RMDIR /s /q _trial_temp
 RMDIR /s /q .coverage