From 31127a2a74ab851fe4b133e7f413719f370d7c94 Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Fri, 15 May 2015 13:09:26 +1000 Subject: [PATCH] Skip 'shocco' code when running tox when running tox in a devstack directory where you have previously run tox -edocs the bashate testenv will fail as the shocco code doesn't match the devstack style. eg: --- E003: Indent not multiple of 4: ' 2>/dev/null ||' - /home/stack/projects/openstack/openstack-dev/devstack/shocco/shocco.sh : L352 27 bashate error(s) found --- Take the easy path and avoid running bashate in the shocco dir. Change-Id: I5b0155332ec994afaffc5c5961902281864cff61 --- tox.ini | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/tox.ini b/tox.ini index 279dcd4f66..e3d19ce60c 100644 --- a/tox.ini +++ b/tox.ini @@ -10,19 +10,20 @@ install_command = pip install {opts} {packages} [testenv:bashate] deps = bashate whitelist_externals = bash -commands = bash -c "find {toxinidir} \ - -not \( -type d -name .?\* -prune \) \ # prune all 'dot' dirs - -not \( -type d -name doc -prune \) \ # skip documentation - -type f \ # only files - -not -name \*~ \ # skip editors, readme, etc - -not -name \*.md \ - \( \ - -name \*.sh -or \ - -name \*rc -or \ - -name functions\* -or \ - -wholename \*/inc/\* -or \ # /inc files and - -wholename \*/lib/\* \ # /lib files are shell, but - \) \ # have no extension +commands = bash -c "find {toxinidir} \ + -not \( -type d -name .?\* -prune \) \ # prune all 'dot' dirs + -not \( -type d -name doc -prune \) \ # skip documentation + -not \( -type d -name shocco -prune \) \ # skip shocco + -type f \ # only files + -not -name \*~ \ # skip editors, readme, etc + -not -name \*.md \ + \( \ + -name \*.sh -or \ + -name \*rc -or \ + -name functions\* -or \ + -wholename \*/inc/\* -or \ # /inc files and + -wholename \*/lib/\* \ # /lib files are shell, but + \) \ # have no extension -print0 | xargs -0 bashate -v" [testenv:docs]