travis.yml: reduce number of jobs to 7

diff --git a/.travis.yml b/.travis.yml
index 8688035e29ea75b2b73f0614e0f8ac911c393886..41d90f38078f9c43b405556f5ca0b6d57f615a30 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -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

diff --git a/Makefile b/Makefile
index ff624e907868d98767f746653d7437ab6c4c1dbd..128c72bb007da11e153b404eefa1e62a0a8aeece 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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