diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-10-21 12:38:43 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-10-21 12:38:43 +0200 |
| commit | 213e3f0860ada9c1f7a5a945d95398c717bfb7aa (patch) | |
| tree | b2559492525283e4de531989d4e9ce82d56ad0c4 /.travis.yml | |
| parent | dd56784d2861d866cc3b6e15a145331297d283f0 (diff) | |
| parent | 8de143a99440d708e8e22bd63bcad25c483d8ffa (diff) | |
| download | spack-213e3f0860ada9c1f7a5a945d95398c717bfb7aa.tar.gz spack-213e3f0860ada9c1f7a5a945d95398c717bfb7aa.tar.bz2 spack-213e3f0860ada9c1f7a5a945d95398c717bfb7aa.tar.xz spack-213e3f0860ada9c1f7a5a945d95398c717bfb7aa.zip | |
Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase
Conflicts:
lib/spack/spack/cmd/install.py
lib/spack/spack/cmd/setup.py
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 7961133c1a..a1f21f5538 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,8 @@ python: - 2.7 env: - - TEST_SUITE=unit + - TEST_SUITE=unit CYAML=true + - TEST_SUITE=unit CYAML=false - TEST_SUITE=flake8 - TEST_SUITE=doc @@ -24,6 +25,7 @@ addons: apt: packages: - graphviz + - libyaml-dev # Install various dependencies install: @@ -31,6 +33,7 @@ install: - pip install flake8 - pip install sphinx - pip install mercurial + - if [[ $CYAML == true ]]; then pip install --global-option "--with-libyaml" pyyaml; fi before_script: # Need this for the git tests to succeed. @@ -43,7 +46,7 @@ before_script: script: share/spack/qa/run-$TEST_SUITE-tests after_success: - - if [[ $TEST_SUITE == unit && $TRAVIS_PYTHON_VERSION == 2.7 ]]; then coveralls; fi + - if [[ $TEST_SUITE == unit && $CYAML == false && $TRAVIS_PYTHON_VERSION == 2.7 ]]; then coveralls; fi notifications: email: |