diff options
| author | Daniel Moody <dmoody256@gmail.com> | 2017-12-09 17:53:00 (GMT) |
|---|---|---|
| committer | Daniel Moody <dmoody256@gmail.com> | 2017-12-09 17:53:00 (GMT) |
| commit | a94f96ffa5568ea465dd8fc8ac41b98780be6161 (patch) | |
| tree | 00db4f33f51dbe9886d3553881946cbb544e1899 | |
| parent | c6cdc1f988c5163a2345a9ea858dc3e9d647a673 (diff) | |
| download | SCons-a94f96ffa5568ea465dd8fc8ac41b98780be6161.zip SCons-a94f96ffa5568ea465dd8fc8ac41b98780be6161.tar.gz SCons-a94f96ffa5568ea465dd8fc8ac41b98780be6161.tar.bz2 | |
updated travis script to not exit, but instead just set the exit code, also setup travis to use code coverage correctly for parallel tests, and finally had to remove the .coveralls, because it is overiding the repo token for my repo, and this should not be in public repos
| -rw-r--r-- | .coveralls.yml | 3 | ||||
| -rw-r--r-- | .travis.yml | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 7a1d4a3..0000000 --- a/.coveralls.yml +++ /dev/null @@ -1,3 +0,0 @@ -service_name: travis-pro -repo_token: 1mUyRvK28QaLiKElPYgQGVlrUHxFhS037 - diff --git a/.travis.yml b/.travis.yml index df932f4..9a23b1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ before_install: - tar xzf rel-3.0.12.tar.gz - cd swig-rel-3.0.12 && ./autogen.sh && ./configure --prefix=/usr && make && sudo make install && cd .. - sudo pip install coverage + - sudo pip install coveralls - echo "import coverage" | sudo tee --append /usr/lib/python2.7/sitecustomize.py - echo "coverage.process_startup()" | sudo tee --append /usr/lib/python2.7/sitecustomize.py @@ -20,6 +21,9 @@ script: - echo "[run]" >> .coveragerc - echo "source = $PWD/src" >> .coveragerc - echo "parallel = True" >> .coveragerc - - coverage run --rcfile=$PWD/.coverage runtest.py -a || if [[ $? == 2 ]]; then exit 0; else exit 1; fi + - coverage run --rcfile=$PWD/.coveragerc runtest.py -a || if [[ $? == 2 ]]; then true; else false; fi + +after_success: - coverage combine - coverage report + - coveralls --rcfile=$PWD/.coveragerc |