X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tox.ini;fp=tox.ini;h=6413c953078eb2ccc39a844158b48321e9c25345;hp=0fd86453288c41aba9e91451efed1b629cfbb295;hb=6f082130e508e151bb8e92ce459a10b05b3c82b8;hpb=1901d5ad9a903d261f98d5d2423afbba90b89206

diff --git a/tox.ini b/tox.ini
index 0fd8645328..6413c95307 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,12 +25,13 @@
 # will execute only checks defined in "pylint" tox environment.
 
 [tox]
-envlist = linelength, autogen, pylint
+envlist = new_line_length, line_length, autogen, pylint
 # The following is needed as tox requires setup.py by default.
 skipsdist = true
+# Just a shorthand to avoid long lines.
+checker_dir = ./resources/libraries/bash/entry/check
 
-# TODO: Tox prints various warnings.
-#   Figure out what they are about and fix them.
+# TODO: Tox prints various warnings. Figure them out and fix them.
 
 [testenv:pylint]
 deps =
@@ -39,24 +40,26 @@ deps =
 whitelist_externals = /bin/bash
 setenv = PYTHONPATH = {toxinidir}
 # Run pylint, but hide its return value until python warnings are cleared.
-commands = bash -c "bash resources/libraries/bash/entry/check/pylint.sh || true"
+commands = bash -c "bash {[tox]checker_dir}/pylint.sh || true"
 
 # TODO: See FIXME in https://gerrit.fd.io/r/16423
 
-[testenv:linelength]
+[testenv:line_length]
 whitelist_externals = /bin/bash
 # Fix all transgressions and remove the " || true" workaround.
-commands = bash -c "bash resources/libraries/bash/entry/check/line.sh || true"
+commands = bash -c "bash {[tox]checker_dir}/line.sh || true"
 
-# It would be possible to add a check which fails
-# if number of long lines increases (from parent commit value),
-# and have it voting.
-# But that would basically prevent us from adding new suites righ now. :(
+[testenv:new_line_length]
+whitelist_externals = /bin/bash
+# Adding .svg, big .rst tables, .yaml and similar still requires long lines.
+# As current implementation is too dumb to filter those out,
+# the checker has to remain non-voting.
+commands = bash -c "bash {[tox]checker_dir}/new_line.sh || true"
 
 [testenv:autogen]
 whitelist_externals = /bin/bash
 setenv = PYTHONPATH = {toxinidir}
-commands = bash resources/libraries/bash/entry/check/autogen.sh
+commands = bash {[tox]checker_dir}/autogen.sh
 
 # TODO: Migrate current docs check here.
 # TODO: Create license checker.