travis.yml: reduce number of jobs to 7

This commit is contained in:
Przemyslaw Skibinski 2017-02-22 08:15:17 +01:00
parent 0df0901b3a
commit 5dd18b314b
2 changed files with 3 additions and 2 deletions

View File

@ -8,7 +8,7 @@ matrix:
# Ubuntu 14.04 LTS Server Edition 64 bit
- env: Ubu=14.04 Cmd='LDFLAGS=-fuse-ld=gold make uasan-test && cd contrib/pzstd && make test-pzstd && make test-pzstd32 && make test-pzstd-tsan && make test-pzstd-asan'
- env: Ubu=14.04 Cmd='make uasan-test && cd contrib/pzstd && make test-pzstd && make test-pzstd32 && make test-pzstd-tsan && make test-pzstd-asan'
dist: trusty
sudo: required
install:
@ -35,6 +35,7 @@ matrix:
- libc6-dev-i386
- gcc-multilib
- gcc-6
- gcc-6-multilib
- env: Ubu=14.04 Cmd="make armtest && make clean && make aarch64test"
dist: trusty

View File

@ -144,7 +144,7 @@ uasan: clean
$(MAKE) test CC=clang MOREFLAGS="-g -fsanitize=address -fsanitize=undefined"
uasan-%: clean
CFLAGS="-Og -fsanitize=address -fsanitize=undefined" $(MAKE) -C $(TESTDIR) $*
LDFLAGS=-fuse-ld=gold CFLAGS="-Og -fsanitize=address -fsanitize=undefined" $(MAKE) -C $(TESTDIR) $*
endif