Merge lp:~mandel/ubuntuone-control-panel/run-tests-extra-params into lp:ubuntuone-control-panel

[Manuel de la Peña]

Forward extra params to u1trial.

Forward extra params to u1trial.

[Roberto Alsina (ralsina)]

+1 tested IRL

review: Approve

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-01-19 15:34:44 +0000
+++ run-tests.bat	2012-01-31 17:00:16 +0000
@@ -21,14 +21,36 @@
 SET IGNORE_PATHS="ubuntuone\controlpanel\gui\gtk, ubuntuone\controlpanel\dbustests"
 SET IGNORE_MODULES="test_linux.py, test_libsoup.py"
 
+:: 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
-:: lets check if we pass the /skip-lint param, if we did we remember and use shift
-if "%1" == "/skip-lint" SET SKIPLINT=1
+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
+
 
 "%PYTHONEXEPATH%\python.exe" setup.py build
 ECHO Running tests
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" --reactor=qt4 --gui -p %IGNORE_PATHS% -i %IGNORE_MODULES% %MODULE%
+"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" --reactor=qt4 --gui -p %IGNORE_PATHS% -i %IGNORE_MODULES% %PARAMS% %MODULE%
 :: Clean the build from the setupt.py
 ECHO Cleaning the generated code
 "%PYTHONEXEPATH%\python.exe" setup.py clean