Merge branch 'dev'

keep local .travis.yml
2017-03-15 01:02:10 -07:00
parent 2c2ee2b4b0 7e35b352c6
commit f2ea8932fc
128 changed files with 9683 additions and 1409 deletions
@@ -18,7 +18,6 @@ matrix:
    - env: Cmd='make ppcinstall && make ppc64test'


-
    - env: Cmd='make gpp6install valgrindinstall && make -C zlibWrapper test && make -C zlibWrapper valgrindTest'
    - env: Cmd='make -C tests versionsTest'
    - env: Cmd='make gpp6install && cd contrib/pzstd && make test-pzstd && make test-pzstd32 && make test-pzstd-tsan && make test-pzstd-asan'