travis.yml: remove tests that overlap with Circle CI
diff --git a/.travis.yml b/.travis.yml
index 82b2b03..f4e38f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@
# Container-based Ubuntu 12.04 LTS Server Edition 64 bit (doesn't support 32-bit includes)
- - 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 -C contrib/pzstd googletest pzstd tests check && make -C contrib/pzstd clean"
os: linux
sudo: false
language: cpp
@@ -33,10 +33,6 @@
# Standard Ubuntu 12.04 LTS Server Edition 64 bit
- - env: Ubu=12.04 Cmd="make -C programs zstd-small zstd-decompress zstd-compress && make -C programs clean && make -C tests versionsTest test-longmatch"
- os: linux
- sudo: required
-
- env: Ubu=12.04 Cmd="make asan32"
os: linux
sudo: required
@@ -65,6 +61,23 @@
# Ubuntu 14.04 LTS Server Edition 64 bit
+ - env: Ubu=14.04 Cmd="make -C contrib/pzstd googletest32
+ && make -C contrib/pzstd all32 && make -C contrib/pzstd check && make -C contrib/pzstd clean"
+ os: linux
+ dist: trusty
+ sudo: required
+ install:
+ - export CXX="g++-4.8" CC="gcc-4.8"
+ addons:
+ apt:
+ packages:
+ - libc6-dev-i386
+ - g++-multilib
+ - gcc-4.8
+ - gcc-4.8-multilib
+ - g++-4.8
+ - g++-4.8-multilib
+
- env: Ubu=14.04 Cmd="make armtest"
dist: trusty
sudo: required
@@ -107,6 +120,8 @@
- qemu-user-static
- gcc-powerpc-linux-gnu
+
+ # other feature branches => short tests
- env: Ubu=14.04 Cmd='make -C lib all && CFLAGS="-O1 -g" make -C zlibWrapper valgrindTest && make -C tests valgrindTest'
os: linux
dist: trusty
@@ -116,14 +131,7 @@
packages:
- 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"
+ - env: Ubu=14.04 Cmd="make zlibwrapper && make clean && make -C tests test-zstd-nolegacy && make clean && make -C tests test32 versionsTest"
os: linux
dist: trusty
sudo: required
@@ -133,39 +141,7 @@
- libc6-dev-i386
- gcc-multilib
- - env: Ubu=14.04 Cmd="make gpptest && make clean && make gnu90test && make clean
- && make c99test && make clean && make gnu99test && make clean
- && make clangtest && make clean && make -C contrib/pzstd googletest32
- && make -C contrib/pzstd all32 && make -C contrib/pzstd check && make -C contrib/pzstd clean"
- os: linux
- dist: trusty
- sudo: required
- install:
- - export CXX="g++-4.8" CC="gcc-4.8"
- addons:
- apt:
- packages:
- - libc6-dev-i386
- - g++-multilib
- - gcc-4.8
- - gcc-4.8-multilib
- - g++-4.8
- - g++-4.8-multilib
- - env: Ubu=14.04 Cmd="make gcc5test && make clean && make gcc6test && make clean && make -C tests dll"
- os: linux
- dist: trusty
- sudo: required
- addons:
- apt:
- sources:
- - ubuntu-toolchain-r-test
- packages:
- - gcc-multilib
- - gcc-5
- - gcc-5-multilib
- - gcc-6
- - gcc-6-multilib
script:
- JOB_NUMBER=$(echo $TRAVIS_JOB_NUMBER | sed -e 's:[0-9][0-9]*\.\(.*\):\1:')