diff options
author | Nathaniel J. Smith <njs@pobox.com> | 2015-12-14 00:03:32 +0000 |
---|---|---|
committer | Nathaniel J. Smith <njs@pobox.com> | 2015-12-14 00:03:32 +0000 |
commit | ba212b909f97565f8d18d695d47646993faf88c7 (patch) | |
tree | 673a8a21428f5e12d6252c8ec074dfb26ffe35af | |
parent | 33d77247d711b16831283661f14ecc7f8f179d73 (diff) | |
parent | f0d6d470c13405f9643f8bde50da74170b66c5c0 (diff) | |
download | numpy-ba212b909f97565f8d18d695d47646993faf88c7.tar.gz |
Merge pull request #6830 from pv/travis-asv
CI: run benchmark suite in travis-CI
-rw-r--r-- | .travis.yml | 5 | ||||
-rwxr-xr-x | tools/travis-test.sh | 11 |
2 files changed, 15 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 314fd18d5..f14b9c912 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,9 @@ matrix: # travis encrypt -r numpy/numpy WHEELHOUSE_UPLOADER_SECRET=tH3AP1KeY - secure: "IEicLPrP2uW+jW51GRwkONQpdPqMVtQL5bdroqR/U8r9TrXrbCVRhp4AP8JYZT0ptoBpmZWWGjmKBndB68QlMiUjQPowiFWt9Ka92CaqYdU7nqfWp9VImSndPmssjmCXJ1v1IjZPAMahp7Qnm0rWRmA0z9SomuRUQOJQ6s684vU=" - python: 2.7 - env: PYTHONOPTIMIZE=2 + env: + - PYTHONOPTIMIZE=2 + - USE_ASV=1 before_install: - uname -a - free -m @@ -74,6 +76,7 @@ before_install: # pip install coverage # Speed up install by not compiling Cython - pip install --install-option="--no-cython-compile" Cython + - if [ -n "$USE_ASV" ]; then pip install asv; fi - popd script: diff --git a/tools/travis-test.sh b/tools/travis-test.sh index af151f434..3591c36df 100755 --- a/tools/travis-test.sh +++ b/tools/travis-test.sh @@ -75,6 +75,17 @@ run_test() $PYTHON ../tools/test-installed-numpy.py # --mode=full # - coverage run --source=$INSTALLDIR --rcfile=../.coveragerc $(which $PYTHON) ../tools/test-installed-numpy.py # - coverage report --rcfile=../.coveragerc --show-missing + + if [ -n "$USE_ASV" ]; then + pushd ../benchmarks + $PYTHON `which asv` machine --machine travis + $PYTHON `which asv` dev 2>&1| tee asv-output.log + if grep -q Traceback asv-output.log; then + echo "Some benchmarks have errors!" + exit 1 + fi + popd + fi } # travis venv tests override python |