ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into dev11

Browse Source
This commit is contained in:
Przemyslaw Skibinski
2017-01-25 12:24:24 +01:00
parent 96f152f708 c4874aab4c
commit e98788e0dc
2 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+21 -17
View File
@@ -8,10 +8,6 @@ matrix:
# Container-based Ubuntu 12.04 LTS Server Edition 64 bit (doesn't support 32-bit includes) # Container-based Ubuntu 12.04 LTS Server Edition 64 bit (doesn't support 32-bit includes)
- env: Ubu=12.04cont Cmd="make test && make clean && make travis-install"
os: linux
sudo: false
- env: Ubu=12.04cont Cmd="make zlibwrapper && make clean && make -C tests test-symbols && make clean && make -C tests test-zstd-nolegacy && make clean && make cmaketest && make clean && make -C contrib/pzstd googletest pzstd tests check && make -C contrib/pzstd clean" - env: Ubu=12.04cont Cmd="make zlibwrapper && make clean && make -C tests test-symbols && make clean && make -C tests test-zstd-nolegacy && make clean && make cmaketest && make clean && make -C contrib/pzstd googletest pzstd tests check && make -C contrib/pzstd clean"
os: linux os: linux
sudo: false sudo: false
@@ -80,7 +76,6 @@ matrix:
- gcc-arm-linux-gnueabi - gcc-arm-linux-gnueabi
- libc6-dev-armel-cross - libc6-dev-armel-cross
# Ubuntu 14.04 LTS Server Edition 64 bit
- env: Ubu=14.04 Cmd="make aarch64test" - env: Ubu=14.04 Cmd="make aarch64test"
dist: trusty dist: trusty
sudo: required sudo: required
@@ -112,6 +107,23 @@ matrix:
packages: packages:
- valgrind - valgrind
# other feature branches => short tests
- env: Ubu=12.04cont Cmd="make test && make clean && make travis-install"
os: linux
sudo: false
- env: Ubu=14.04 Cmd="make -C tests test32"
os: linux
dist: trusty
sudo: required
addons:
apt:
packages:
- libc6-dev-i386
- gcc-multilib
- env: Ubu=14.04 Cmd="make gpptest && make clean && make gnu90test && make clean - env: Ubu=14.04 Cmd="make gpptest && make clean && make gnu90test && make clean
&& make c99test && make clean && make gnu99test && make clean && make c99test && make clean && make gnu99test && make clean
&& make clangtest && make clean && make -C contrib/pzstd googletest32 && make clangtest && make clean && make -C contrib/pzstd googletest32
@@ -131,16 +143,6 @@ matrix:
- g++-4.8 - g++-4.8
- g++-4.8-multilib - g++-4.8-multilib
- env: Ubu=14.04 Cmd="make -C tests test32"
os: linux
dist: trusty
sudo: required
addons:
apt:
packages:
- libc6-dev-i386
- gcc-multilib
- env: Ubu=14.04 Cmd="make gcc5test && make clean && make gcc6test && make clean && make -C tests dll" - env: Ubu=14.04 Cmd="make gcc5test && make clean && make gcc6test && make clean && make -C tests dll"
os: linux os: linux
dist: trusty dist: trusty
@@ -158,5 +160,7 @@ matrix:
script: script:
- JOB_NUMBER=$(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:') - JOB_NUMBER=$(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:')
# - if [ $JOB_NUMBER -eq 9 ] || [ $JOB_NUMBER -eq 10 ]; then sh -c "$Cmd"; fi # dev => normal tests; other feature branches => short tests (number > 11)
- sh -c "$Cmd" - if [ "$TRAVIS_BRANCH" != "master" ] && [ "$TRAVIS_BRANCH" = "dev" ] || [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ $JOB_NUMBER -gt 11 ]; then sh -c "$Cmd"; fi
# master => long tests, as this is the final step towards a Release
- if [ "$TRAVIS_BRANCH" = "master" ]; then FUZZERTEST=-T10mn sh -c "$Cmd"; fi
tests/Makefile
+2 -2
View File
@@ -52,8 +52,8 @@ endif
VOID = /dev/null VOID = /dev/null
ZSTREAM_TESTTIME = -T2mn ZSTREAM_TESTTIME = -T2mn
FUZZERTEST= -T5mn FUZZERTEST ?= -T5mn
ZSTDRTTEST= --test-large-data ZSTDRTTEST = --test-large-data
.PHONY: default all all32 dll clean test test32 test-all namespaceTest versionsTest .PHONY: default all all32 dll clean test test32 test-all namespaceTest versionsTest