From: Yann Collet <Cyan4973@users.noreply.github.com>
Date: Thu, 26 Jan 2017 22:23:44 +0000 (-0800)
Subject: Merge pull request #519 from inikep/dev11
X-Git-Tag: v1.1.3^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=717c65d6903477472af1e5cf44e290589dec7761;p=thirdparty%2Fzstd.git

Merge pull request #519 from inikep/dev11

Dev11
---

717c65d6903477472af1e5cf44e290589dec7761
diff --cc .travis.yml
index b0489bd63,c5a387791..ba9f9965d
--- a/.travis.yml
+++ b/.travis.yml
@@@ -121,9 -107,26 +116,26 @@@ matrix
            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"
+       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
                         && 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
                         && make -C contrib/pzstd all32 && make -C contrib/pzstd check && make -C contrib/pzstd clean"
        os: linux
        dist: trusty