summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2016-05-10 00:31:43 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2016-05-10 00:51:08 -0700
commite60f25f20944517ce064e2091f9e680d9c46eda4 (patch)
treeaee107921fcae54b32e55e3402bbbe0d2c32d770
parentd3ade02c161822589e4647056293da2b8313d70c (diff)
downloadspack-e60f25f20944517ce064e2091f9e680d9c46eda4.tar.gz
spack-e60f25f20944517ce064e2091f9e680d9c46eda4.tar.bz2
spack-e60f25f20944517ce064e2091f9e680d9c46eda4.tar.xz
spack-e60f25f20944517ce064e2091f9e680d9c46eda4.zip
Move args to .coveragerc
-rw-r--r--.coveragerc7
-rw-r--r--.travis.yml4
2 files changed, 9 insertions, 2 deletions
diff --git a/.coveragerc b/.coveragerc
index 37410a3677..a1271a94fc 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,6 +1,13 @@
+# -*- conf -*-
# .coveragerc to control coverage.py
[run]
branch = True
+source = lib
+omit =
+ lib/spack/spack/test/*
+ lib/spack/env/*
+ lib/spack/docs/*
+ lib/spack/external/*
[report]
# Regexes for lines to exclude from consideration
diff --git a/.travis.yml b/.travis.yml
index 30dfebf783..4ff4d5f483 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,9 @@ script:
- spack config get compilers
- spack install -v libdwarf
# Run unit tests with code coverage
- - coverage run --source=lib --omit=lib/spack/spack/test/*,lib/spack/env/*,lib/spack/docs/*,lib/spack/external/* bin/spack test
+ - coverage run bin/spack test
# Checks if the file that have been changed are flake8 conformant
- - CHANGED_PYTHON_FILES=`git diff develop... --name-only | perl -ne 'print if /\.py/g'`
+ - CHANGED_PYTHON_FILES=`git diff develop... --name-only | perl -ne 'print if /\.py$/'`
- if [[ ${CHANGED_PYTHON_FILES} ]] ; then flake8 --format pylint --config flake8.ini ${CHANGED_PYTHON_FILES} ; fi