Merge lp:~mandel/ubuntuone-control-panel/skip-lint into lp:ubuntuone-control-panel

[Manuel de la Peña]

Adds the possibility to skip the lint checks on windows when passing the /skip-lint parameter to run-tests.bat.

Adds the possibility to skip the lint checks on windows when passing the /skip-lint parameter to run-tests.bat.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'run-tests.bat'
--- run-tests.bat	2011-12-27 18:48:44 +0000
+++ run-tests.bat	2012-01-19 14:52:32 +0000
@@ -1,37 +1,42 @@
-:: Author: Natalia B. Bidart <[e-mail]>
-::
-:: Copyright 2011 Canonical Ltd.
-::
-:: This program is free software: you can redistribute it and/or modify it
-:: under the terms of the GNU General Public License version 3, as published
-:: by the Free Software Foundation.
-::
-:: This program is distributed in the hope that it will be useful, but
-:: WITHOUT ANY WARRANTY; without even the implied warranties of
-:: MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-:: PURPOSE.  See the GNU General Public License for more details.
-::
-:: You should have received a copy of the GNU General Public License along
-:: with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-:: call setup.py build so that the qt uic is called
-
-@ECHO off
-
-SET MODULE="ubuntuone"
-SET PYTHONEXEPATH="C:\Python27"
-SET IGNORE_PATHS="ubuntuone\controlpanel\gui\gtk, ubuntuone\controlpanel\dbustests"
+:: Copyright 2011-12 Canonical Ltd.
+::
+:: This program is free software: you can redistribute it and/or modify it
+:: under the terms of the GNU General Public License version 3, as published
+:: by the Free Software Foundation.
+::
+:: This program is distributed in the hope that it will be useful, but
+:: WITHOUT ANY WARRANTY; without even the implied warranties of
+:: MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+:: PURPOSE.  See the GNU General Public License for more details.
+::
+:: You should have received a copy of the GNU General Public License along
+:: with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+:: call setup.py build so that the qt uic is called
+
+@ECHO off
+
+SET MODULE="ubuntuone"
+SET PYTHONEXEPATH="C:\Python27"
+SET IGNORE_PATHS="ubuntuone\controlpanel\gui\gtk, ubuntuone\controlpanel\dbustests"
 SET IGNORE_MODULES="test_linux.py, test_libsoup.py"
 
-"%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%
-:: Clean the build from the setupt.py
-ECHO Cleaning the generated code before running the style checks...
-"%PYTHONEXEPATH%\python.exe" setup.py clean
-ECHO Performing style checks...
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1lint" --ignore ubuntuone\controlpanel\gui\qt\ui "%MODULE%"
-"%PYTHONEXEPATH%\Scripts\pep8.exe" --exclude ".svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py" --repeat . bin\*
-:: Delete the temp folders
-RMDIR /s /q _trial_temp
+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
+
+"%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%
+:: Clean the build from the setupt.py
+ECHO Cleaning the generated code
+"%PYTHONEXEPATH%\python.exe" setup.py clean
+
+IF %SKIPLINT% == 1 GOTO :CLEAN
+ECHO Performing style checks...
+"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1lint" --ignore ubuntuone\controlpanel\gui\qt\ui "%MODULE%"
+"%PYTHONEXEPATH%\Scripts\pep8.exe" --exclude ".svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py" --repeat . bin\*
+:CLEAN
+:: Delete the temp folders
+RMDIR /s /q _trial_temp