Skip to content

Commit

Permalink
Merge pull request #25 from pfernique/master
Browse files Browse the repository at this point in the history
Correct coverage
  • Loading branch information
pfernique authored Aug 9, 2016
2 parents 4f41855 + 2e3858c commit 523720a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
9 changes: 8 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,21 @@ before_install:
- conda update -q conda
- conda info -a
- conda install conda-build
- pip install coverage
- pip install coveralls


script:
- conda build conda/python-autowig -c statiskit -c conda-forge
- conda build conda/python-autowig -c statiskit -c conda-forge --no-test
- conda install python-autowig -c statiskit -c conda-forge --use-local
- python setup.py develop --user
- conda install python-clanglite -c statiskit
- pip install nose
- nosetests test -v --with-coverage --cover-package=autowig

after_success:
- coveralls
- coveralls debug
- if [[ "$TRAVIS_BRANCH" = "master" ]] && [[ "$TRAVIS_PULL_REQUEST" = "false" ]]; then
conda install anaconda-client;
anaconda login --username ${ANACONDA_USERNAME%%} --password ${ANACONDA_PASSWORD%%};
Expand Down
6 changes: 3 additions & 3 deletions conda/python-autowig/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ test:
- python-clanglite
commands:
- nosetests {{ SRC_DIR }} -v --with-coverage --cover-package=autowig
- if [[ $TRAVIS_BUILD_DIR ]]; then
mv .coverage $TRAVIS_BUILD_DIR;
fi
#- if [[ $TRAVIS_BUILD_DIR ]]; then
# ln -s .coverage $TRAVIS_BUILD_DIR/.coverage;
# fi
2 changes: 2 additions & 0 deletions src/py/autowig/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ def pre_processing(asg, headers, flags, **kwargs):
raise ValueError('\'flags\' parameter must include the `-x` option with `c` or `c++`')

if not bootstrapping:
out, err = s.communicate()
print err
if s.returncode:
warnings.warn('System includes not computed: clang command failed', Warning)
else:
Expand Down

0 comments on commit 523720a

Please sign in to comment.