diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-07-30 18:10:33 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-07-30 18:49:23 +0200 |
| commit | f4422dc165b37b8dbad0af31dd0a3d24671a1e49 (patch) | |
| tree | ffe4a1445bdda8be02a8cbd2250dc2842955c344 | |
| parent | e04662f84ff9fdf30221f0a50d566eb5ded0f20c (diff) | |
| download | spack-f4422dc165b37b8dbad0af31dd0a3d24671a1e49.tar.gz spack-f4422dc165b37b8dbad0af31dd0a3d24671a1e49.tar.bz2 spack-f4422dc165b37b8dbad0af31dd0a3d24671a1e49.tar.xz spack-f4422dc165b37b8dbad0af31dd0a3d24671a1e49.zip | |
qa : fixes #1370 (no flake8 on python 2.6, coveralls only python 2.7)
| -rw-r--r-- | .travis.yml | 25 | ||||
| -rwxr-xr-x | share/spack/qa/run-unit-tests | 20 |
2 files changed, 34 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index 904143a00f..b376a33490 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,17 @@ language: python + python: - "2.6" - "2.7" +env: + - TEST_TYPE=unit + - TEST_TYPE=flake8 + +# Exclude flake8 from python 2.6 +matrix: + exclude: + - python: "2.6" + env: TEST_TYPE=flake8 # Use new Travis infrastructure (Docker can't sudo yet) sudo: false @@ -20,20 +30,13 @@ before_install: - git fetch origin develop:develop script: - # Regular spack setup and tests - - . share/spack/setup-env.sh - - spack compilers - - spack config get compilers - - spack install -v libdwarf - - # Run unit tests with code coverage - - coverage run bin/spack test - + # Run unit tests with code coverage plus install libdwarf + - 'if [ "$TEST_TYPE" = "unit" ]; then share/spack/qa/run-unit-tests; fi' # Run flake8 code style checks. - - share/spack/qa/run-flake8 + - 'if [ "$TEST_TYPE" = "flake8" ]; then share/spack/qa/run-flake8; fi' after_success: - - coveralls + - 'if [ "$TEST_TYPE" = "unit" ] && [ "$TRAVIS_PYTHON_VERSION" = "2.7" ]; then coveralls; fi' notifications: email: diff --git a/share/spack/qa/run-unit-tests b/share/spack/qa/run-unit-tests new file mode 100755 index 0000000000..33fb1bfae2 --- /dev/null +++ b/share/spack/qa/run-unit-tests @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +# +# This script runs Spack unit tests. +# +# It should be executed from the top-level directory of the repo, +# e.g.: +# +# share/spack/qa/run-unit-tests +# +# To run it, you'll need to have the Python coverage installed locally. +# + +# Regular spack setup and tests +. ./share/spack/setup-env.sh +spack compilers +spack config get compilers +spack install -v libdwarf + +# Run unit tests with code coverage +coverage run bin/spack test |