Merge pull request #519 from inikep/dev11

Dev11

diff --cc .travis.yml
index b0489bd63881a1fa8d1e078cd53d265d37c4f5ef,c5a38779169ada9b9bf85506bfc949106133fdef..ba9f9965d9d471d996463185980735e0c4dcb76b
--- 1/.travis.yml
--- 2/.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

diff --cc lib/compress/zstd_opt.h
Simple merge

diff --cc programs/fileio.c
Simple merge

diff --cc tests/Makefile
Simple merge